From 58e07dc06139cace281c82d3a9d62678c50c1758 Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Tue, 30 Aug 2011 11:00:56 +0300 Subject: [PATCH] libav-config: support pre-tool-rename versions Various executable tools were earlier renamed in Libav (ffplay->avplay etc) and the corresponding configure --disable-xyz switches were renamed accordingly. Make libav-config check which tool names exist in libav/ and add --disable switches according to that. This allows checking out older Libav versions (for testing) or FFmpeg in the libav/ dir and compiling against those; previously the --disable-avplay switch would be used unconditionally, and would cause a failure if the library version didn't recognize that name. --- script/libav-config | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/script/libav-config b/script/libav-config index 5fc2fd5..bec153b 100755 --- a/script/libav-config +++ b/script/libav-config @@ -36,9 +36,12 @@ def main(): '--enable-pthreads', '--disable-shared', '--enable-static', '--enable-postproc', - '--disable-devices', '--disable-ffmpeg', '--disable-avconv', - '--disable-avplay', '--disable-avserver','--disable-avprobe', - '--disable-vaapi'] + '--disable-devices', '--disable-vaapi'] + executables = 'avconv ffmpeg avplay ffplay avserver ffserver ' \ + 'avprobe ffprobe'.split() + for name in executables: + if path.exists(path.join('libav', name + '.c')): + args.append('--disable-' + name) executable = path.join(mydir, 'libav', 'configure') -- 2.11.4.GIT