Attachment #142108 for bug #208019




	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);

Lines 27-32 Link Here

(-)mpeg4ip-1.5.0.1.old/player/plugin/video/ffmpeg/ffmpeg.h (+1 lines)
27	#ifdef HAVE_FFMPEG_INSTALLED	27	#ifdef HAVE_FFMPEG_INSTALLED
28	extern "C" {	28	extern "C" {
29	#include <ffmpeg/avcodec.h>	29	#include <ffmpeg/avcodec.h>
		30	#include <ffmpeg/swscale.h>
30	}	31	}
31	#else	32	#else
32	extern "C" {	33	extern "C" {

Lines 509-515 Link Here

(-)mpeg4ip-1.5.0.1.old/configure.in (-1 / +1 lines)
509	if test x$have_ffmpeg = xtrue; then	509	if test x$have_ffmpeg = xtrue; then
510	AC_DEFINE(HAVE_FFMPEG_INSTALLED, 1, [defined if ffmpeg is installed])	510	AC_DEFINE(HAVE_FFMPEG_INSTALLED, 1, [defined if ffmpeg is installed])
511	FFMPEG_INC=	511	FFMPEG_INC=
512	FFMPEG_LIB="-lavcodec -lz $ffmpeg_add_libs"	512	FFMPEG_LIB="-lavcodec -lz $ffmpeg_add_libs $(pkg-config libswscale --libs --silence-errors)"
513	AC_CHECK_TYPES([AVRational], , , [#include <ffmpeg/avcodec.h>])	513	AC_CHECK_TYPES([AVRational], , , [#include <ffmpeg/avcodec.h>])
514	AC_CHECK_MEMBERS(AVCodecContext.time_base, , , [#include <ffmpeg/avcodec.h>])	514	AC_CHECK_MEMBERS(AVCodecContext.time_base, , , [#include <ffmpeg/avcodec.h>])
515	AC_DEFINE(HAVE_FFMPEG, 1, [enable ffmpeg for mp4live])	515	AC_DEFINE(HAVE_FFMPEG, 1, [enable ffmpeg for mp4live])

Return to bug 208019

Lines 566-574 Link Here

(-)mpeg4ip-1.5.0.1.old/player/plugin/video/ffmpeg/ffmpeg.cpp (+11 lines)
566	from.linesize[ix] = ffmpeg->m_picture->linesize[ix];	566	from.linesize[ix] = ffmpeg->m_picture->linesize[ix];
567	}	567	}
568		568
		569	#ifdef HAVE_FFMPEG_INSTALLED
		570	SwsContext *pSWSCtx;
		571	pSWSCtx = sws_getContext(ffmpeg->m_c->width, ffmpeg->m_c->height,
		572	ffmpeg->m_c->pix_fmt,
		573	ffmpeg->m_c->width, ffmpeg->m_c->height,
		574	PIX_FMT_YUV420P, SWS_BICUBIC, 0, 0, 0);
		575	sws_scale(pSWSCtx, from.data, from.linesize, 0, ffmpeg->m_c->height,
		576	to.data, to.linesize);
		577	sws_freeContext(pSWSCtx);
		578	#else
569	img_convert(&to, PIX_FMT_YUV420P,	579	img_convert(&to, PIX_FMT_YUV420P,
570	&from, ffmpeg->m_c->pix_fmt,	580	&from, ffmpeg->m_c->pix_fmt,
571	ffmpeg->m_c->width, ffmpeg->m_c->height);	581	ffmpeg->m_c->width, ffmpeg->m_c->height);
		582	#endif
572	ffmpeg->m_vft->video_filled_buffer(ffmpeg->m_ifptr,	583	ffmpeg->m_vft->video_filled_buffer(ffmpeg->m_ifptr,
573	ffmpeg->have_cached_ts ?	584	ffmpeg->have_cached_ts ?
574	ffmpeg->cached_ts : ts);	585	ffmpeg->cached_ts : ts);