[vlc-commits] Contribs: use FFmpeg for the time being

[Jean-Baptiste Kempf]

vlc/vlc-2.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Dec 29 11:15:00 2013 +0100| [37fa883c2fc6517d5b73055139c64e1c890bf881] | committer: Jean-Baptiste Kempf

Contribs: use FFmpeg for the time being

This solve the issues:
 - Xvid matrix not taken into account
 - FFv1.3 support
 - Lagarith YV12 support
 - non-SSE2 CPU crash, notably Athlon XP

More info can be found here:
https://wiki.videolan.org/libavcodec_regressions/

Close #7411 #9606 #7375 (and related) #10203

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=37fa883c2fc6517d5b73055139c64e1c890bf881
---

 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 ada8107..17f269d 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=9aa053ceded5550b2e538578af383fd89d82364c