rpms/vlc/devel 0001-port-to-FFmpeg-0.8-API.patch, NONE, 1.1 vlc.spec, 1.128, 1.129

Author: kwizart Update of /cvs/free/rpms/vlc/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv31032 Modified Files: vlc.spec Added Files: 0001-port-to-FFmpeg-0.8-API.patch Log Message: Add patch for FFmpeg-0.8 0001-port-to-FFmpeg-0.8-API.patch: switcher.c | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) --- NEW FILE 0001-port-to-FFmpeg-0.8-API.patch --- From: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net&gt; Date: Sun, 4 Sep 2011 23:58:53 +0200 Subject: [PATCH] port to FFmpeg-0.8 API Signed-off-by: Nicolas Chauvet <kwizart(a)gmail.com&gt; --- modules/stream_out/switcher.c | 41 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 40 insertions(+), 1 deletions(-) diff --git a/modules/stream_out/switcher.c b/modules/stream_out/switcher.c index ca57a28..d96f690 100644 --- a/modules/stream_out/switcher.c +++ b/modules/stream_out/switcher.c @@ -358,6 +358,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) /* Set CPU capabilities */ unsigned i_cpu = vlc_CPU(); id->ff_enc_c->dsp_mask = 0; +#if FF_API_MM_FLAGS if( !(i_cpu & CPU_CAPABILITY_MMX) ) { id->ff_enc_c->dsp_mask |= FF_MM_MMX; @@ -375,7 +376,25 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) id->ff_enc_c->dsp_mask |= FF_MM_SSE; id->ff_enc_c->dsp_mask |= FF_MM_SSE2; } - +#else + if( !(i_cpu & CPU_CAPABILITY_MMX) ) + { + id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_MMX; + } + if( !(i_cpu & CPU_CAPABILITY_MMXEXT) ) + { + id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_MMX2; + } + if( !(i_cpu & CPU_CAPABILITY_3DNOW) ) + { + id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_3DNOW; + } @@ -764,6 +784,25 @@ static mtime_t VideoCommand( sout_stream_t *p_stream, sout_stream_id_t *id ) id->ff_enc_c->dsp_mask |= FF_MM_SSE; id->ff_enc_c->dsp_mask |= FF_MM_SSE2; } +#else + if( !(i_cpu & CPU_CAPABILITY_MMX) ) + { + id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_MMX; + } + if( !(i_cpu & CPU_CAPABILITY_MMXEXT) ) + { + id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_MMX2; + } + if( !(i_cpu & CPU_CAPABILITY_3DNOW) ) + { + id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_3DNOW; + } + if( !(i_cpu & CPU_CAPABILITY_SSE) ) + { + id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_SSE; + id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_SSE2; + } +#endif id->ff_enc_c->width = p_sys->p_pictures[p_sys->i_cmd-1].format.i_width; id->ff_enc_c->height = p_sys->p_pictures[p_sys->i_cmd-1].format.i_height; -- 1.7.4.4 Index: vlc.spec =================================================================== RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v retrieving revision 1.128 retrieving revision 1.129 diff -u -r1.128 -r1.129 --- vlc.spec 19 Sep 2011 22:55:25 -0000 1.128 +++ vlc.spec 20 Sep 2011 08:53:06 -0000 1.129 @@ -39,6 +39,7 @@ Patch4: vlc-1.1.4-tls_path.patch Patch5: vlc-1.1.8-bugfix.opencv22.patch Patch6: vlc-1.1-bugfix-20110920.patch +Patch7: 0001-port-to-FFmpeg-0.8-API.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -253,6 +254,7 @@ %endif sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in %patch6 -p1 +%patch7 -p1 -b .ff08 rm modules/access/videodev2.h ln -sf %{_includedir}/linux/videodev2.h modules/access/videodev2.h @@ -565,6 +567,7 @@ %changelog * Tue Sep 20 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.1.11-2 - Update to current bugfix +- Add patch for FFmpeg-0.8 * Wed Jul 20 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.1.11-1 - Update to 1.1.11