repositories
/
deb_ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Debian version 2.5.0~trusty1.1
[deb_ffmpeg.git]
/
scripts
/
ffmpeg-config
diff --git
a/scripts/ffmpeg-config
b/scripts/ffmpeg-config
index b98d54561a6e55391ecb4c381d00236f70bcdc8d..bcac71578abdddf042cd69e06708cc4dfbd6d5cf 100755
(executable)
--- a/
scripts/ffmpeg-config
+++ b/
scripts/ffmpeg-config
@@
-6,10
+6,10
@@
BUILD="$(pwd)"
if test -f "$BUILD"/ffmpeg_options ; then
USER_OPTS=$(cat "$BUILD"/ffmpeg_options)
fi
if test -f "$BUILD"/ffmpeg_options ; then
USER_OPTS=$(cat "$BUILD"/ffmpeg_options)
fi
-OPTIONS=" --prefix=/opt/ffmpeg --enable-avresample --disable-debug --enable-nonfree --enable-gpl --enable-version3 --enable-
x11grab --enable-
libpulse --enable-libopencore-amrnb --enable-libopencore-amrwb --disable-decoder=amrnb --disable-decoder=amrwb $USER_OPTS"
+OPTIONS=" --prefix=/opt/ffmpeg --enable-avresample --disable-debug --enable-nonfree --enable-gpl --enable-version3 --enable-libpulse --enable-libopencore-amrnb --enable-libopencore-amrwb --disable-decoder=amrnb --disable-decoder=amrwb $USER_OPTS"
# optional flags for encoding
# optional flags for encoding
-OPTIONS="$OPTIONS --enable-libx264 --enable-libx265 --enable-libfdk-aac --enable-libvorbis --enable-libmp3lame --enable-libopus --enable-libvpx --enable-libspeex --enable-libass --enable-avisynth --enable-libsoxr --enable-libxvid "
+OPTIONS="$OPTIONS --enable-libx264 --enable-libx265 --enable-libfdk-aac --enable-libvorbis --enable-libmp3lame --enable-libopus --enable-libvpx --enable-libspeex --enable-libass --enable-avisynth --enable-libsoxr --enable-libxvid
--enable-libvo-aacenc
"
echo Using ffmpeg options: $OPTIONS
echo Using ffmpeg options: $OPTIONS