diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-17 23:16:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-17 23:16:05 +0100 |
| commit | 967bdb8572f27b9891fe7bd9b8489146a906633d (patch) | |
| tree | 61b486be897a4503f71e2ecc7734f16930dc1a94 /tests/codec-regression.sh | |
| parent | 219a6fb61cb9e6f534f20dc3313442f89b0ffd42 (diff) | |
| parent | 6ca3b248e21fc48418c4221fc92c2eecaf07cb9b (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
resample: allocate a large enough output buffer
fate: fix enc_dec_pcm tests with remote target
wmaenc: remove bit-exact hack
FATE: remove WMA acodec tests
FATE: add WMAv1 and WMAv2 encode/decode tests with fuzzy comparison
FATE: add AC-3 and E-AC-3 encode/decode tests with fuzzy comparison
qtrle: Use bytestream2 functions to prevent buffer overreads.
vqavideo: check malloc return values
x11grab: fix a memory leak exposed by valgrind
threads: fix old frames returned after avcodec_flush_buffers()
MPV: always mark dummy frames as reference
h264: fix deadlocks on incomplete reference frame decoding.
mpeg4: report frame decoding completion at ff_MPV_frame_end().
mimic: don't use self as reference, and report completion at end of decode().
Conflicts:
libavcodec/h264.c
libavcodec/qtrle.c
libavcodec/resample.c
libavcodec/vqavideo.c
libavdevice/x11grab.c
tests/ref/seek/wmav1_asf
tests/ref/seek/wmav2_asf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/codec-regression.sh')
| -rwxr-xr-x | tests/codec-regression.sh | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/tests/codec-regression.sh b/tests/codec-regression.sh index 714a94fb2f..ae1ea1be43 100755 --- a/tests/codec-regression.sh +++ b/tests/codec-regression.sh @@ -439,17 +439,6 @@ do_audio_encoding flac.flac "-acodec flac -compression_level 2" do_audio_decoding fi -if [ -n "$do_wmav1" ] ; then -do_audio_encoding wmav1.asf "-acodec wmav1" -do_avconv_nomd5 $pcm_dst $DEC_OPTS -i $target_path/$file -f wav -$tiny_psnr $pcm_dst $pcm_ref 2 8192 -fi -if [ -n "$do_wmav2" ] ; then -do_audio_encoding wmav2.asf "-acodec wmav2" -do_avconv_nomd5 $pcm_dst $DEC_OPTS -i $target_path/$file -f wav -$tiny_psnr $pcm_dst $pcm_ref 2 8192 -fi - #if [ -n "$do_vorbis" ] ; then # vorbis #disabled because it is broken |