diff options
| author | Kevin Mitchell <kevmitch@math.sfu.ca> | 2014-01-29 16:26:25 -0800 |
|---|---|---|
| committer | Kevin Mitchell <kevmitch@math.sfu.ca> | 2014-01-29 16:30:42 -0800 |
| commit | 9ce245ecf9b42c22e69048912d3003b01a6c43c9 (patch) | |
| tree | 5057d60d2a79da55ad8286e4acf4dcaaa6f6b76b | |
| parent | 61c98b57b74f1776a763a4befc3684faf0f45548 (diff) | |
| download | mpv-build-9ce245ecf9b42c22e69048912d3003b01a6c43c9.tar.bz2 mpv-build-9ce245ecf9b42c22e69048912d3003b01a6c43c9.tar.xz | |
allow user to specify ffmpeg options from either or both the
ffmpeg_options file and arguments to the scripts/ffmpeg-config script
| -rwxr-xr-x | scripts/ffmpeg-config | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/ffmpeg-config b/scripts/ffmpeg-config index 2213171..57f2bd1 100755 --- a/scripts/ffmpeg-config +++ b/scripts/ffmpeg-config @@ -3,8 +3,9 @@ set -e BUILD="$(pwd)" +USER_OPTS="$@" if test -f "$BUILD"/ffmpeg_options ; then - USER_OPTS=$(cat "$BUILD"/ffmpeg_options) + USER_OPTS="$(cat "$BUILD"/ffmpeg_options) $USER_OPTS" fi OPTIONS="--enable-gpl --enable-avresample --disable-debug --disable-doc $USER_OPTS" |