Commit 128323b2 authored by Sam Hocevar's avatar Sam Hocevar

* 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.
parent e52713ad
......@@ -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
......
......@@ -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
===================================================================
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment