diff options
| -rw-r--r-- | README.rst | 15 | ||||
| -rwxr-xr-x | scripts/ffmpeg-config | 5 | ||||
| -rwxr-xr-x | scripts/mpv-config | 6 |
3 files changed, 19 insertions, 7 deletions
@@ -163,7 +163,20 @@ because these are untested bleeding-edge development versions of the code. Use on your own risk. -(Note: in earlier mpv-build revisions, the script ``force-head`` did this.) +Warning +------- + +./rebuild will call ./update, but without this flag, and thus will +checkout the release version again (i.e. it will not use master). + +mpv configure options +===================== + +Just like ``ffmpeg_options``, the file ``mpv_options`` can be used +to set custom mpv configure options. Like with ffmpeg_option, it +expects one switch per line (e.g. ``--enable-something``). + +But normally, you shouldn't need this. Contact ======= 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 |