packages: vlc/vlc.spec, vlc/vlc-ffmpeg.patch - fixes for new ffmpeg in swit...

[lisu]

Author: lisu                         Date: Mon Jul 18 08:55:05 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixes for new ffmpeg in switcher.c file (upstream didn't fix that)

---- Files affected:
packages/vlc:
   vlc.spec (1.268 -> 1.269) , vlc-ffmpeg.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/vlc/vlc.spec
diff -u packages/vlc/vlc.spec:1.268 packages/vlc/vlc.spec:1.269
--- packages/vlc/vlc.spec:1.268	Mon Jul 18 10:30:03 2011
+++ packages/vlc/vlc.spec	Mon Jul 18 10:54:59 2011
@@ -54,6 +54,7 @@
 Patch2:		%{name}-osdmenu_path.patch
 Patch3:		%{name}-system-minizip.patch
 Patch4:		%{name}-upnp.patch
+Patch5:		%{name}-ffmpeg.patch
 URL:		http://www.videolan.org/vlc/
 %{?with_directfb:BuildRequires:	DirectFB-devel}
 BuildRequires:	OpenGL-devel
@@ -299,6 +300,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 cp -f /usr/share/automake/config.* .
@@ -857,6 +859,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.269  2011/07/18 08:54:59  lisu
+- fixes for new ffmpeg in switcher.c file (upstream didn't fix that)
+
 Revision 1.268  2011/07/18 08:30:03  lisu
 - updated to 1.1.11
 - verbose make

================================================================
Index: packages/vlc/vlc-ffmpeg.patch
diff -u /dev/null packages/vlc/vlc-ffmpeg.patch:1.3
--- /dev/null	Mon Jul 18 10:55:05 2011
+++ packages/vlc/vlc-ffmpeg.patch	Mon Jul 18 10:54:59 2011
@@ -0,0 +1,54 @@
+--- vlc-1.1.11/modules/stream_out/switcher.c~	2010-04-13 02:22:27.000000000 +0200
++++ vlc-1.1.11/modules/stream_out/switcher.c	2011-07-18 10:50:50.614630948 +0200
+@@ -362,20 +362,20 @@
+         id->ff_enc_c->dsp_mask = 0;
+         if( !(i_cpu & CPU_CAPABILITY_MMX) )
+         {
+-            id->ff_enc_c->dsp_mask |= FF_MM_MMX;
++            id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_MMX;
+         }
+         if( !(i_cpu & CPU_CAPABILITY_MMXEXT) )
+         {
+-            id->ff_enc_c->dsp_mask |= FF_MM_MMXEXT;
++            id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_MMX2;
+         }
+         if( !(i_cpu & CPU_CAPABILITY_3DNOW) )
+         {
+-            id->ff_enc_c->dsp_mask |= FF_MM_3DNOW;
++            id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_3DNOW;
+         }
+         if( !(i_cpu & CPU_CAPABILITY_SSE) )
+         {
+-            id->ff_enc_c->dsp_mask |= FF_MM_SSE;
+-            id->ff_enc_c->dsp_mask |= FF_MM_SSE2;
++            id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_SSE;
++            id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_SSE2;
+         }
+ 
+         id->ff_enc_c->sample_rate = p_fmt->audio.i_rate;
+@@ -751,20 +751,20 @@
+         id->ff_enc_c->dsp_mask = 0;
+         if( !(i_cpu & CPU_CAPABILITY_MMX) )
+         {
+-            id->ff_enc_c->dsp_mask |= FF_MM_MMX;
++            id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_MMX;
+         }
+         if( !(i_cpu & CPU_CAPABILITY_MMXEXT) )
+         {
+-            id->ff_enc_c->dsp_mask |= FF_MM_MMXEXT;
++            id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_MMX2;
+         }
+         if( !(i_cpu & CPU_CAPABILITY_3DNOW) )
+         {
+-            id->ff_enc_c->dsp_mask |= FF_MM_3DNOW;
++            id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_3DNOW;
+         }
+         if( !(i_cpu & CPU_CAPABILITY_SSE) )
+         {
+-            id->ff_enc_c->dsp_mask |= FF_MM_SSE;
+-            id->ff_enc_c->dsp_mask |= FF_MM_SSE2;
++            id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_SSE;
++            id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_SSE2;
+         }
+ 
+         id->ff_enc_c->width = p_sys->p_pictures[p_sys->i_cmd-1].format.i_width;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vlc/vlc.spec?r1=1.268&r2=1.269&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vlc/vlc-ffmpeg.patch?r1=1.2&r2=1.3&f=u