aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2010-05-07 11:52:05 +0000
committerMichael Niedermayer <michaelni@gmx.at>2010-05-07 11:52:05 +0000
commitcccc039f71f4cff7e72b8681cf26d41839dbdc62 (patch)
tree34dd86b3989815a02354f710bab40a5e001813b9
parent87ddc38bdb29ed9038145428c0a5352b2f40afa0 (diff)
downloadffmpeg-cccc039f71f4cff7e72b8681cf26d41839dbdc62.tar.gz
Enable libavfilter by default and fix pading for mxf-d10
Originally committed as revision 23048 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rwxr-xr-xconfigure3
-rwxr-xr-xtests/lavf-regression.sh2
2 files changed, 3 insertions, 2 deletions
diff --git a/configure b/configure
index 50c25551c5..29aa5ec1a0 100755
--- a/configure
+++ b/configure
@@ -89,7 +89,7 @@ Configuration options:
--disable-avformat disable libavformat build
--disable-swscale disable libswscale build
--enable-postproc enable GPLed postprocessing support [no]
- --enable-avfilter video filter support [no]
+ --disable-avfilter disable video filter support [no]
--enable-avfilter-lavf video filters dependent on avformat [no]
--enable-beosthreads use BeOS threads [no]
--enable-os2threads use OS/2 threads [no]
@@ -1468,6 +1468,7 @@ host_os=$target_os_default
# configurable options
enable avcodec
enable avdevice
+enable avfilter
enable avformat
enable avutil
enable asm
diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh
index 6e489a6f35..b0fd728854 100755
--- a/tests/lavf-regression.sh
+++ b/tests/lavf-regression.sh
@@ -68,7 +68,7 @@ fi
if [ -n "$do_mxf" ] ; then
do_lavf mxf "-ar 48000 -bf 2 -timecode_frame_start 264363"
-do_lavf mxf_d10 "-ar 48000 -ac 2 -r 25 -s 720x576 -padtop 32 -vcodec mpeg2video -intra -flags +ildct+low_delay -dc 10 -flags2 +ivlc+non_linear_q -qscale 1 -ps 1 -qmin 1 -rc_max_vbv_use 1 -rc_min_vbv_use 1 -pix_fmt yuv422p -minrate 30000k -maxrate 30000k -b 30000k -bufsize 1200000 -top 1 -rc_init_occupancy 1200000 -qmax 12 -f mxf_d10"
+do_lavf mxf_d10 "-ar 48000 -ac 2 -r 25 -s 720x576 -vfilters pad=720:608:0:32 -vcodec mpeg2video -intra -flags +ildct+low_delay -dc 10 -flags2 +ivlc+non_linear_q -qscale 1 -ps 1 -qmin 1 -rc_max_vbv_use 1 -rc_min_vbv_use 1 -pix_fmt yuv422p -minrate 30000k -maxrate 30000k -b 30000k -bufsize 1200000 -top 1 -rc_init_occupancy 1200000 -qmax 12 -f mxf_d10"
fi
if [ -n "$do_ts" ] ; then