[vlc-commits] contribs: don't build avconv binary

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Sun Sep 25 00:18:31 2011 -0400| [e53d01ea3ba96358a532833244c4d5fefc995618] | committer: Rafaël Carré

contribs: don't build avconv binary

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

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

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index dca09c1..5112d91 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -17,6 +17,7 @@ FFMPEGCONF = \
 	--disable-ffserver \
 	--disable-ffmpeg \
 	--disable-ffplay \
+	--disable-avconv \
 	--disable-devices \
 	--disable-protocols \
 	--disable-avfilter \
diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index 62c5e67..62edc31 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -946,6 +946,7 @@ FFMPEGCONF = --disable-doc \
 	--disable-ffserver \
 	--disable-ffmpeg \
 	--disable-ffplay \
+	--disable-avconv \
 	--disable-devices \
 	--disable-protocols \
 	--disable-avfilter \