[vlc-commits] Contribs: use FFmpeg by default

[Jean-Baptiste Kempf]

vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Jan 28 11:26:45 2015 +0100| [127cc7cf849912719014f55529f5f8ee328bbad9] | committer: Jean-Baptiste Kempf

Contribs: use FFmpeg by default

See #13777 (double-free in h264)
See #11510 (oma not working in libav)
See #13744 (PGS not working in libav)
See #13625 (MPJEG)
See #12945 (flv)
See H265 not working:
http://people.videolan.org/~jb/tmp/Luca/milkgirls1080p.mov-crf_26-preset_slow.mkv

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=127cc7cf849912719014f55529f5f8ee328bbad9
---

 contrib/src/ffmpeg/rules.mak |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 2951d9c..e55187c 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -2,7 +2,7 @@
 
 #Uncomment the one you want
 #USE_LIBAV ?= 1
-#USE_FFMPEG ?= 1
+USE_FFMPEG ?= 1
 
 ifdef USE_FFMPEG
 HASH=fe47cba