[patch] files/mpeg4ip-1.5.0.1-img_convert_workaround.patch

mpeg4ip-1.5.0.1-img_convert_workaround.patch (text/plain), 2.29 KB, created by MaratIK on 2008-01-29 11:57:06 UTC

diff -urN mpeg4ip-1.5.0.1.old/player/plugin/video/ffmpeg/ffmpeg.cpp mpeg4ip-1.5.0.1/player/plugin/video/ffmpeg/ffmpeg.cpp
--- mpeg4ip-1.5.0.1.old/player/plugin/video/ffmpeg/ffmpeg.cpp	2008-01-29 13:39:57.000000000 +0300
+++ mpeg4ip-1.5.0.1/player/plugin/video/ffmpeg/ffmpeg.cpp	2008-01-29 13:47:48.000000000 +0300
@@ -566,9 +566,20 @@
 	from.linesize[ix] = ffmpeg->m_picture->linesize[ix];
       }
       
+#ifdef HAVE_FFMPEG_INSTALLED
+      SwsContext *pSWSCtx;
+      pSWSCtx = sws_getContext(ffmpeg->m_c->width, ffmpeg->m_c->height,
+                               ffmpeg->m_c->pix_fmt,
+                               ffmpeg->m_c->width, ffmpeg->m_c->height,
+                               PIX_FMT_YUV420P, SWS_BICUBIC, 0, 0, 0);
+      sws_scale(pSWSCtx, from.data, from.linesize, 0, ffmpeg->m_c->height,
+                to.data, to.linesize);
+      sws_freeContext(pSWSCtx);
+#else
       img_convert(&to, PIX_FMT_YUV420P,
 		  &from, ffmpeg->m_c->pix_fmt,
 		  ffmpeg->m_c->width, ffmpeg->m_c->height);
+#endif
       ffmpeg->m_vft->video_filled_buffer(ffmpeg->m_ifptr,
 					 ffmpeg->have_cached_ts ?
 					 ffmpeg->cached_ts : ts);
diff -urN mpeg4ip-1.5.0.1.old/player/plugin/video/ffmpeg/ffmpeg.h mpeg4ip-1.5.0.1/player/plugin/video/ffmpeg/ffmpeg.h
--- mpeg4ip-1.5.0.1.old/player/plugin/video/ffmpeg/ffmpeg.h	2008-01-29 13:39:57.000000000 +0300
+++ mpeg4ip-1.5.0.1/player/plugin/video/ffmpeg/ffmpeg.h	2008-01-29 13:41:24.000000000 +0300
@@ -27,6 +27,7 @@
 #ifdef HAVE_FFMPEG_INSTALLED
 extern "C" {
 #include <ffmpeg/avcodec.h>
+#include <ffmpeg/swscale.h>
 }
 #else
 extern "C" {
diff -urN mpeg4ip-1.5.0.1.old/configure.in mpeg4ip-1.5.0.1/configure.in
--- mpeg4ip-1.5.0.1.old/configure.in	2008-01-29 14:44:04.000000000 +0300
+++ mpeg4ip-1.5.0.1/configure.in	2008-01-29 14:52:49.000000000 +0300
@@ -509,7 +509,7 @@
      if test x$have_ffmpeg = xtrue; then
         AC_DEFINE(HAVE_FFMPEG_INSTALLED, 1, [defined if ffmpeg is installed])
         FFMPEG_INC=
-        FFMPEG_LIB="-lavcodec -lz $ffmpeg_add_libs"
+        FFMPEG_LIB="-lavcodec -lz $ffmpeg_add_libs $(pkg-config libswscale --libs --silence-errors)"
         AC_CHECK_TYPES([AVRational], , , [#include <ffmpeg/avcodec.h>])
 	AC_CHECK_MEMBERS(AVCodecContext.time_base, , , [#include <ffmpeg/avcodec.h>])
         AC_DEFINE(HAVE_FFMPEG, 1, [enable ffmpeg for mp4live])