diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-06-17 07:49:41 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-17 07:49:58 +0400 |
| commit | 4f643430f295a8376ca51f127a23b0f8ce92068b (patch) | |
| tree | d21f7dc85241d354636964c50d17481c2442a8da /tests | |
| parent | d8ee777021ac251c48274e7fd9864acb9e19a5cb (diff) | |
| parent | 9446d75941d639f19cfa9ae007eb4c5ca041f200 (diff) | |
Merge commit '9446d75941d639f19cfa9ae007eb4c5ca041f200'
* commit '9446d75941d639f19cfa9ae007eb4c5ca041f200':
ffmpeg: merge output_codecs array into AVOutputStream members.
rtpenc_latm: Consistently use "Libav" in license boilerplate.
rtsp: Don't pass string pointer as format string to ff_url_join
mmsh: fixed printf injection bug in mmsh request
codec-regression: remove pointless -r options for dnxhd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/codec-regression.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/codec-regression.sh b/tests/codec-regression.sh index 70a77e5558..b210231aea 100755 --- a/tests/codec-regression.sh +++ b/tests/codec-regression.sh @@ -224,17 +224,17 @@ fi if [ -n "$do_dnxhd_1080i" ] ; then # FIXME: interlaced raw DNxHD decoding is broken do_video_encoding dnxhd-1080i.mov "-vcodec dnxhd -flags +ildct -s hd1080 -b 120M -pix_fmt yuv422p -vframes 5 -an" -do_video_decoding "-r 25" "-s cif -pix_fmt yuv420p" +do_video_decoding "" "-s cif -pix_fmt yuv420p" fi if [ -n "$do_dnxhd_720p" ] ; then do_video_encoding dnxhd-720p.dnxhd "-s hd720 -b 90M -pix_fmt yuv422p -vframes 5 -an" -do_video_decoding "-r 25" "-s cif -pix_fmt yuv420p" +do_video_decoding "" "-s cif -pix_fmt yuv420p" fi if [ -n "$do_dnxhd_720p_rd" ] ; then do_video_encoding dnxhd-720p-rd.dnxhd "-threads 4 -mbd rd -s hd720 -b 90M -pix_fmt yuv422p -vframes 5 -an" -do_video_decoding "-r 25" "-s cif -pix_fmt yuv420p" +do_video_decoding "" "-s cif -pix_fmt yuv420p" fi if [ -n "$do_svq1" ] ; then |