[vlc-commits] contrib: ffmpeg was removed from libav

[Rafaël Carré]

vlc/vlc-2.0 | branch: master | Rafaël Carré <funman at videolan.org> | Tue Jan 24 19:09:27 2012 -0500| [ef43d6b2386484d3eb61fb99d1a5cf6145c0e40b] | committer: Rafaël Carré

contrib: ffmpeg was removed from libav
(cherry picked from commit c48f8460bb5911e8436825adbaf707a3b33c3558)

Signed-off-by: Rafaël Carré <funman at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=ef43d6b2386484d3eb61fb99d1a5cf6145c0e40b
---

 contrib/src/ffmpeg/rules.mak |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index b9519cf..500b0f7 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -12,7 +12,6 @@ FFMPEGCONF = \
 	--disable-debug \
 	--enable-gpl \
 	--enable-postproc \
-	--disable-ffmpeg \
 	--disable-avconv \
 	--disable-devices \
 	--disable-protocols \