diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-20 22:18:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-20 22:18:26 +0200 |
| commit | 3194ab78a6c4ea0a4c60c91c4d0ea34028ca408f (patch) | |
| tree | 13f41910a7e4feec8d64182bf3b6772d88236098 /tests/codec-regression.sh | |
| parent | 9b1f776d751472e8a376b412d02a96a35044e2a0 (diff) | |
| parent | b0e9edc44f1722787adacbff9aa60343206a58c0 (diff) | |
| download | ffmpeg-3194ab78a6c4ea0a4c60c91c4d0ea34028ca408f.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avcodec: add a cook parser to get subpacket duration
FATE: allow lavf tests to alter input parameters
FATE: replace the acodec-pcm_s24daud test with an enc_dec_pcm checksum test
FATE: replace the acodec-g726 test with 4 new encode/decode tests
FATE: replace current g722 encoding tests with an encode/decode test
FATE: add a pattern rule for generating asynth wav files
FATE: optionally write a WAVE header in audiogen
avutil: add audio fifo buffer
Conflicts:
doc/APIchanges
libavcodec/version.h
libavutil/avutil.h
tests/Makefile
tests/codec-regression.sh
tests/fate/voice.mak
tests/lavf-regression.sh
tests/ref/acodec/g722
tests/ref/acodec/g726
tests/ref/acodec/pcm_s24daud
tests/ref/lavf/dv_fmt
tests/ref/lavf/gxf
tests/ref/lavf/mxf
tests/ref/lavf/mxf_d10
tests/ref/seek/lavf_dv
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/codec-regression.sh')
| -rwxr-xr-x | tests/codec-regression.sh | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/tests/codec-regression.sh b/tests/codec-regression.sh index 1e5f8166bd..51d1b4c67b 100755 --- a/tests/codec-regression.sh +++ b/tests/codec-regression.sh @@ -395,16 +395,6 @@ do_audio_encoding g723_1.tco "-b:a 6.3k -ac 1 -ar 8000 -acodec g723_1" do_audio_decoding fi -if [ -n "$do_g722" ] ; then -do_audio_encoding g722.wav "-b 64k -ac 1 -ar 16000 -acodec g722" -do_audio_decoding -fi - -if [ -n "$do_g726" ] ; then -do_audio_encoding g726.wav "-b:a 32k -ac 1 -ar 8000 -acodec g726" -do_audio_decoding -fi - if [ -n "$do_adpcm_adx" ] ; then do_audio_encoding adpcm_adx.adx "-acodec adpcm_adx" do_audio_decoding @@ -534,6 +524,3 @@ fi if [ -n "$do_pcm_f64le" ] ; then do_audio_enc_dec wav dbl pcm_f64le fi -if [ -n "$do_pcm_s24daud" ] ; then -do_audio_enc_dec 302 s16 pcm_s24daud "-ac 6 -ar 96000" -fi |