* extras/contrib/src/Patches/ffmpeg-cvs-wince.patch: updated for current SVN.

  * extras/contrib/src/Makefile: re-added --disable-codec flags (the FFMPEG
    tree on altair was outdated) but removed the duplicate vorbis one.

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 939172ce36ab468f1ddadbb1105913a6c4ea4b26..9b3395623dba5c6ed8e02846b35374967dee61d6 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -98,7 +98,7 @@ endif
 
 ifdef HAVE_WINCE
 HOSTCONF+= --without-pic --disable-shared
-FFMPEGCONF+= --enable-mingwce --cpu=armv4l --disable-debug --disable-encoders --disable-muxers --disable-mpegaudio-hp --disable-protocols
+FFMPEGCONF+= --enable-mingwce --cpu=armv4l --disable-debug --disable-encoders --disable-muxers --disable-mpegaudio-hp --disable-codec=snow --disable-codec=vc9 --disable-codec=wmv3 --disable-codec=vorbis --disable-codec=dvdsub --disable-codec=dvbsub --disable-protocols
 else
 FFMPEGCONF+= --enable-mp3lame --enable-faac
 endif

diff --git a/extras/contrib/src/Patches/ffmpeg-cvs-wince.patch b/extras/contrib/src/Patches/ffmpeg-cvs-wince.patch
index 06db99a61612a864d6fd3d3003e4217c16a1a686..f587a775b9bd4f4b7dd8b183c16e2e146a6ddcda 100644 (file)
--- a/extras/contrib/src/Patches/ffmpeg-cvs-wince.patch
+++ b/extras/contrib/src/Patches/ffmpeg-cvs-wince.patch
@@ -450,8 +450,8 @@ diff -u -r1.53 allformats.c
      ffm_init();
 +#endif
 +    
- #if defined(CONFIG_VIDEO4LINUX) || defined(CONFIG_BKTR)
-     video_grab_init();
+ #if defined(CONFIG_VIDEO4LINUX2)
+     v4l2_init();
  #endif
 Index: ../ffmpeg/libavformat/asf-enc.c
 ===================================================================