mirror of
https://code.videolan.org/videolan/vlc
synced 2024-09-04 09:11:33 +02:00
* 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.
This commit is contained in:
parent
e52713ada4
commit
128323b2e9
@ -98,7 +98,7 @@ endif
|
|||||||
|
|
||||||
ifdef HAVE_WINCE
|
ifdef HAVE_WINCE
|
||||||
HOSTCONF+= --without-pic --disable-shared
|
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
|
else
|
||||||
FFMPEGCONF+= --enable-mp3lame --enable-faac
|
FFMPEGCONF+= --enable-mp3lame --enable-faac
|
||||||
endif
|
endif
|
||||||
|
@ -450,8 +450,8 @@ diff -u -r1.53 allformats.c
|
|||||||
ffm_init();
|
ffm_init();
|
||||||
+#endif
|
+#endif
|
||||||
+
|
+
|
||||||
#if defined(CONFIG_VIDEO4LINUX) || defined(CONFIG_BKTR)
|
#if defined(CONFIG_VIDEO4LINUX2)
|
||||||
video_grab_init();
|
v4l2_init();
|
||||||
#endif
|
#endif
|
||||||
Index: ../ffmpeg/libavformat/asf-enc.c
|
Index: ../ffmpeg/libavformat/asf-enc.c
|
||||||
===================================================================
|
===================================================================
|
||||||
|
Loading…
Reference in New Issue
Block a user