[vlc-commits] Contrib: avconv was removed from FFmpeg

[Jean-Baptiste Kempf]

vlc/vlc-2.0 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Jan 27 19:49:12 2012 +0100| [a0ca2ab7298ba9470237489b9d8a616d5f9e68d3] | committer: Jean-Baptiste Kempf

Contrib: avconv was removed from FFmpeg
(cherry picked from commit b87a34a7cc6d2253a97943604cc337a1416b9947)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 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 500b0f7..5da2988 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-avconv \
 	--disable-devices \
 	--disable-protocols \
 	--disable-avfilter \