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/ref/lavf | |
| 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/ref/lavf')
| -rw-r--r-- | tests/ref/lavf/dv_fmt | 4 | ||||
| -rw-r--r-- | tests/ref/lavf/gxf | 4 | ||||
| -rw-r--r-- | tests/ref/lavf/mxf_d10 | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tests/ref/lavf/dv_fmt b/tests/ref/lavf/dv_fmt index 884c079243..ea667b9627 100644 --- a/tests/ref/lavf/dv_fmt +++ b/tests/ref/lavf/dv_fmt @@ -4,6 +4,6 @@ cc33ae4f9e6828914dea0f09d1241b7e *./tests/data/lavf/lavf.dv 3480000 ./tests/data/lavf/lavf.dv ./tests/data/lavf/lavf.dv CRC=0x8d5e9e8f -3a6a9163a67b729b4a6b5d972ccceb97 *./tests/data/lavf/lavf.dv +b36c83cd0ba0ebe719f09f885c4bbcd3 *./tests/data/lavf/lavf.dv 3600000 ./tests/data/lavf/lavf.dv -./tests/data/lavf/lavf.dv CRC=0x5ce4e5e4 +./tests/data/lavf/lavf.dv CRC=0x2bc2ae3a diff --git a/tests/ref/lavf/gxf b/tests/ref/lavf/gxf index 5796895a1d..63101b89ed 100644 --- a/tests/ref/lavf/gxf +++ b/tests/ref/lavf/gxf @@ -4,6 +4,6 @@ befc1a39c37a4ecd9264942a3e34b3f6 *./tests/data/lavf/lavf.gxf 267d2b2b6e357209d76c366302cf35c3 *./tests/data/lavf/lavf.gxf 794572 ./tests/data/lavf/lavf.gxf ./tests/data/lavf/lavf.gxf CRC=0xab47d02d -1c1693cf2358025f1e37ac76e1da925a *./tests/data/lavf/lavf.gxf +0a1a37fa79b62435545271b4e8e882f5 *./tests/data/lavf/lavf.gxf 796392 ./tests/data/lavf/lavf.gxf -./tests/data/lavf/lavf.gxf CRC=0x102918fd +./tests/data/lavf/lavf.gxf CRC=0x3b1a8e91 diff --git a/tests/ref/lavf/mxf_d10 b/tests/ref/lavf/mxf_d10 index efeac5a2c0..a10e8456ed 100644 --- a/tests/ref/lavf/mxf_d10 +++ b/tests/ref/lavf/mxf_d10 @@ -1,3 +1,3 @@ -23177c8a72f34e243e9ffc4f6c70d3c7 *./tests/data/lavf/lavf.mxf_d10 +0d72247067569901a2e351586ddc0b82 *./tests/data/lavf/lavf.mxf_d10 5330989 ./tests/data/lavf/lavf.mxf_d10 -./tests/data/lavf/lavf.mxf_d10 CRC=0x81602ff1 +./tests/data/lavf/lavf.mxf_d10 CRC=0x4474d480 |