diff options
| author | wm4 <wm4@nowhere> | 2014-04-18 14:41:01 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-04-18 14:43:32 +0200 |
| commit | a460a64c61eea321012638d06b9f27511984e296 (patch) | |
| tree | 4376b70526eb7c71895003f58950185029720a63 /scripts | |
| parent | 7fd102ec319ca1372e2054cdac5548208af659ca (diff) | |
| download | mpv-build-a460a64c61eea321012638d06b9f27511984e296.tar.bz2 mpv-build-a460a64c61eea321012638d06b9f27511984e296.tar.xz | |
Remove customization note in ffmpeg-config
People edit this -> ./update stops working, unless the changes are
committed, which is not very obvious. They should edit ffmpeg_options
instead. There's a big section in the README about this.
Also, make mpv-config read mpv_config.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/ffmpeg-config | 5 | ||||
| -rwxr-xr-x | scripts/mpv-config | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/scripts/ffmpeg-config b/scripts/ffmpeg-config index 57f2bd1..163fd0f 100755 --- a/scripts/ffmpeg-config +++ b/scripts/ffmpeg-config @@ -9,11 +9,6 @@ if test -f "$BUILD"/ffmpeg_options ; then fi OPTIONS="--enable-gpl --enable-avresample --disable-debug --disable-doc $USER_OPTS" -# optional flags for encoding (uncomment if you want to support these encoders) -#OPTIONS="$OPTIONS --enable-libx264" -#OPTIONS="$OPTIONS --enable-libmp3lame" -#OPTIONS="$OPTIONS --enable-nonfree --enable-libfdk-aac" - echo Using ffmpeg options: $OPTIONS mkdir -p "$BUILD"/ffmpeg_build diff --git a/scripts/mpv-config b/scripts/mpv-config index f7f92f7..7c71b27 100755 --- a/scripts/mpv-config +++ b/scripts/mpv-config @@ -1,7 +1,11 @@ #!/bin/sh set -e -OPTIONS="" +USER_OPTS="$@" +if test -f "$BUILD"/mpv_options ; then + USER_OPTS="$(cat "$BUILD"/mpv_options) $USER_OPTS" +fi +OPTIONS="$USER_OPTS" BUILD="$(pwd)" cd "$BUILD"/mpv |