diff --git a/0001-port-to-FFmpeg-0.8-API.patch b/0001-port-to-FFmpeg-0.8-API.patch new file mode 100644 index 0000000..1484d23 --- /dev/null +++ b/0001-port-to-FFmpeg-0.8-API.patch @@ -0,0 +1,69 @@ +From e2a0e38258a16da56a5d850e179a691839558dcd Mon Sep 17 00:00:00 2001 +From: Dominik 'Rathann' Mierzejewski +Date: Sun, 4 Sep 2011 23:58:53 +0200 +Subject: [PATCH] port to FFmpeg-0.8 API + +Signed-off-by: Nicolas Chauvet +--- + 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 + diff --git a/vlc.spec b/vlc.spec index 6f35c78..3fd790f 100644 --- a/vlc.spec +++ b/vlc.spec @@ -39,6 +39,7 @@ Patch3: vlc-1.1.6-hardode_font_patch.patch 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 @@ JACK audio plugin for the VLC media player. %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 @@ fi || : %changelog * Tue Sep 20 2011 Nicolas Chauvet - 1.1.11-2 - Update to current bugfix +- Add patch for FFmpeg-0.8 * Wed Jul 20 2011 Nicolas Chauvet - 1.1.11-1 - Update to 1.1.11