[gentoo-commits] gentoo-x86 commit in media-libs/mlt/files: mlt-0.7.6-ffmpeg.patch

[Alexis Ballier (aballier)]

aballier    11/11/28 13:35:24

  Added:                mlt-0.7.6-ffmpeg.patch
  Log:
  fix build with ffmpeg git: do not use internal symbols
  
  (Portage version: 2.2.0_alpha79/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  media-libs/mlt/files/mlt-0.7.6-ffmpeg.patch

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

Index: mlt-0.7.6-ffmpeg.patch
===================================================================
Do not use ffmpeg internal symbols.

Index: mlt-0.7.6/src/modules/avformat/filter_avdeinterlace.c
===================================================================
--- mlt-0.7.6.orig/src/modules/avformat/filter_avdeinterlace.c
+++ mlt-0.7.6/src/modules/avformat/filter_avdeinterlace.c
@@ -26,7 +26,9 @@
 
 // ffmpeg Header files
 #include <libavformat/avformat.h>
+#include <libavcodec/avcodec.h>
 
+#if 0
 #ifdef USE_MMX
 #include "mmx.h"
 #else
@@ -293,6 +295,7 @@ static int mlt_avpicture_deinterlace(AVP
 #endif
     return 0;
 }
+#endif
 
 /** Do it :-).
 */
@@ -318,7 +321,7 @@ static int filter_get_image( mlt_frame f
 
 		// Fill the picture
 		avpicture_fill( output, *image, PIX_FMT_YUYV422, *width, *height );
-		mlt_avpicture_deinterlace( output, output, PIX_FMT_YUYV422, *width, *height );
+		avpicture_deinterlace( output, output, PIX_FMT_YUYV422, *width, *height );
 
 		// Free the picture
 		mlt_pool_release( output );