public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in media-libs/libquicktime/files: libquicktime-1.2.2-ffmpeg07.patch
@ 2011-04-25 20:55 Alexis Ballier (aballier)
  0 siblings, 0 replies; 2+ messages in thread
From: Alexis Ballier (aballier) @ 2011-04-25 20:55 UTC (permalink / raw
  To: gentoo-commits

aballier    11/04/25 20:55:53

  Added:                libquicktime-1.2.2-ffmpeg07.patch
  Log:
  fix build with ffmpeg/libav trunk
  
  (Portage version: 2.2.0_alpha30/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  media-libs/libquicktime/files/libquicktime-1.2.2-ffmpeg07.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libquicktime/files/libquicktime-1.2.2-ffmpeg07.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libquicktime/files/libquicktime-1.2.2-ffmpeg07.patch?rev=1.1&content-type=text/plain

Index: libquicktime-1.2.2-ffmpeg07.patch
===================================================================
Index: libquicktime-1.2.2/plugins/ffmpeg/lqt_ffmpeg.c
===================================================================
--- libquicktime-1.2.2.orig/plugins/ffmpeg/lqt_ffmpeg.c
+++ libquicktime-1.2.2/plugins/ffmpeg/lqt_ffmpeg.c
@@ -1031,8 +1031,8 @@ static void set_codec_info(struct CODECI
   snprintf(ffmpeg_long_name, 256, "%s", map->name);
   snprintf(ffmpeg_description, 256, "%s", map->name);
   
-  if((map->encoder && (map->encoder->type == CODEC_TYPE_VIDEO)) ||
-     (map->decoder && (map->decoder->type == CODEC_TYPE_VIDEO))){
+  if((map->encoder && (map->encoder->type == AVMEDIA_TYPE_VIDEO)) ||
+     (map->decoder && (map->decoder->type == AVMEDIA_TYPE_VIDEO))){
        codec_info_ffmpeg.type = LQT_CODEC_VIDEO;
   } else {
        codec_info_ffmpeg.type = LQT_CODEC_AUDIO;
Index: libquicktime-1.2.2/plugins/ffmpeg/params.c
===================================================================
--- libquicktime-1.2.2.orig/plugins/ffmpeg/params.c
+++ libquicktime-1.2.2/plugins/ffmpeg/params.c
@@ -205,8 +205,10 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
   PARAM_FLOAT("ff_p_masking",p_masking);
   PARAM_FLOAT("ff_dark_masking",dark_masking);
   PARAM_ENUM("ff_prediction_method",prediction_method,prediction_method);
+#if LIBAVCODEC_VERSION_MAJOR < 53
   PARAM_INT("ff_mb_qmin",mb_qmin);
   PARAM_INT("ff_mb_qmax",mb_qmax);
+#endif
   PARAM_ENUM("ff_me_cmp",me_cmp,compare_func);
   PARAM_CMP_CHROMA("ff_me_cmp_chroma",me_cmp);
   PARAM_ENUM("ff_me_sub_cmp",me_sub_cmp,compare_func);






^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-libs/libquicktime/files: libquicktime-1.2.2-ffmpeg07.patch
@ 2012-03-30 13:08 Samuli Suominen (ssuominen)
  0 siblings, 0 replies; 2+ messages in thread
From: Samuli Suominen (ssuominen) @ 2012-03-30 13:08 UTC (permalink / raw
  To: gentoo-commits

ssuominen    12/03/30 13:08:56

  Removed:              libquicktime-1.2.2-ffmpeg07.patch
  Log:
  old
  
  (Portage version: 2.2.0_alpha96/cvs/Linux x86_64)



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-03-30 13:09 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-25 20:55 [gentoo-commits] gentoo-x86 commit in media-libs/libquicktime/files: libquicktime-1.2.2-ffmpeg07.patch Alexis Ballier (aballier)
  -- strict thread matches above, loose matches on Subject: below --
2012-03-30 13:08 Samuli Suominen (ssuominen)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox