diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-22 14:06:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-22 15:00:53 +0200 |
| commit | 124deea1a0ccc4296cc6021231a7e6fbf336ff3a (patch) | |
| tree | 95db44e4e9ed969674f9dbb194a999c8150a1e03 /tests/lavf-regression.sh | |
| parent | aeba058340ec47a10049c9cefb7ca8d500047b31 (diff) | |
| parent | ae60927aefe7a9debc285451b2badf1b8eb5ab22 (diff) | |
| download | ffmpeg-124deea1a0ccc4296cc6021231a7e6fbf336ff3a.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libx264: only use ABR mode when the user explicitly set bitrate.
libx264: use medium preset by default.
mp2 encoder: make 128k the default bitrate.
movenc: use libx264 by default when possible for mov, mp4 and psp
avienc: saner default audio codec.
matroskaenc: saner default codecs.
avplay: add examples of how to specify size/pixel format through private options
lavc: add A|E|D flags to "ac" and "ar" options
Conflicts:
doc/ffplay.texi
libavcodec/libx264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/lavf-regression.sh')
| -rwxr-xr-x | tests/lavf-regression.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh index f1175ef4b5..67dfb4e328 100755 --- a/tests/lavf-regression.sh +++ b/tests/lavf-regression.sh @@ -44,11 +44,11 @@ do_audio_only() } if [ -n "$do_avi" ] ; then -do_lavf avi +do_lavf avi "-acodec mp2 -ab 64k" fi if [ -n "$do_asf" ] ; then -do_lavf asf "-acodec mp2" "-r 25" +do_lavf asf "-acodec mp2 -ab 64k" "-r 25" fi if [ -n "$do_rm" ] ; then @@ -59,7 +59,7 @@ do_avconv $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $DEC_OPTS -ar 441 fi if [ -n "$do_mpg" ] ; then -do_lavf mpg +do_lavf mpg "-ab 64k" fi if [ -n "$do_mxf" ] ; then @@ -71,7 +71,7 @@ do_lavf mxf_d10 "-ar 48000 -ac 2 -r 25 -s 720x576 -vf pad=720:608:0:32 -vcodec m fi if [ -n "$do_ts" ] ; then -do_lavf ts +do_lavf ts "-ab 64k" fi if [ -n "$do_swf" ] ; then @@ -79,7 +79,7 @@ do_lavf swf -an fi if [ -n "$do_ffm" ] ; then -do_lavf ffm +do_lavf ffm "-ab 64k" fi if [ -n "$do_flv_fmt" ] ; then @@ -87,7 +87,7 @@ do_lavf flv -an fi if [ -n "$do_mov" ] ; then -do_lavf mov "-acodec pcm_alaw" +do_lavf mov "-acodec pcm_alaw -vcodec mpeg4" fi if [ -n "$do_dv_fmt" ] ; then @@ -99,11 +99,11 @@ do_lavf gxf "-ar 48000 -r 25 -s pal -ac 1" fi if [ -n "$do_nut" ] ; then -do_lavf nut "-acodec mp2" +do_lavf nut "-acodec mp2 -ab 64k" fi if [ -n "$do_mkv" ] ; then -do_lavf mkv +do_lavf mkv "-acodec mp2 -ab 64k -vcodec mpeg4" fi |