diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-10 02:14:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-10 02:25:41 +0200 |
| commit | 61930bd0d7154b6f3f8c8d2398c056c20e921652 (patch) | |
| tree | 54108723e1482e5d20a152f7a46c67ea51441965 /tests/ref/fate/adpcm-ea-1 | |
| parent | 35894ebbf9bef18a31dbb90a8a8818fbdc85a184 (diff) | |
| parent | c8b4a3999bc7f3732a537cdec6475918a65d6e78 (diff) | |
| download | ffmpeg-61930bd0d7154b6f3f8c8d2398c056c20e921652.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (27 commits)
libxvid: Give more suitable names to libxvid-related files.
libxvid: Separate libxvid encoder from libxvid rate control code.
jpeglsdec: Remove write-only variable in ff_jpegls_decode_lse().
fate: cosmetics: lowercase some comments
fate: Give more consistent names to some RealVideo/RealAudio tests.
lavfi: add avfilter_get_audio_buffer_ref_from_arrays().
lavfi: add extended_data to AVFilterBuffer.
lavc: check that extended_data is properly set in avcodec_encode_audio2().
lavc: pad last audio frame with silence when needed.
samplefmt: add a function for filling a buffer with silence.
samplefmt: add a function for copying audio samples.
lavr: do not try to copy to uninitialized output audio data.
lavr: make avresample_read() with NULL output discard samples.
fate: split idroq audio and video into separate tests
fate: improve dependencies
fate: add convenient shorthands for ea-vp6, libavcodec, libavutil tests
fate: split some combined tests into separate audio and video tests
fate: fix dependencies for probe tests
mips: intreadwrite: fix inline asm for gcc 4.8
mips: intreadwrite: remove unnecessary inline asm
...
Conflicts:
cmdutils.h
configure
doc/APIchanges
doc/filters.texi
ffmpeg.c
ffplay.c
libavcodec/internal.h
libavcodec/jpeglsdec.c
libavcodec/libschroedingerdec.c
libavcodec/libxvid.c
libavcodec/libxvid_rc.c
libavcodec/utils.c
libavcodec/version.h
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/buffersink.h
tests/Makefile
tests/fate/aac.mak
tests/fate/audio.mak
tests/fate/demux.mak
tests/fate/ea.mak
tests/fate/image.mak
tests/fate/libavutil.mak
tests/fate/lossless-audio.mak
tests/fate/lossless-video.mak
tests/fate/microsoft.mak
tests/fate/qt.mak
tests/fate/real.mak
tests/fate/screen.mak
tests/fate/video.mak
tests/fate/voice.mak
tests/fate/vqf.mak
tests/ref/fate/ea-mad
tests/ref/fate/ea-tqi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/fate/adpcm-ea-1')
| -rw-r--r-- | tests/ref/fate/adpcm-ea-1 | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/tests/ref/fate/adpcm-ea-1 b/tests/ref/fate/adpcm-ea-1 new file mode 100644 index 0000000000..f5a33df710 --- /dev/null +++ b/tests/ref/fate/adpcm-ea-1 @@ -0,0 +1,26 @@ +#tb 0: 1/22050 +0, 0, 0, 1484, 5936, 0x00000000 +0, 1484, 1484, 1456, 5824, 0x00000000 +0, 2940, 2940, 1484, 5936, 0x00000000 +0, 4424, 4424, 1456, 5824, 0x00000000 +0, 5880, 5880, 1484, 5936, 0x00000000 +0, 7364, 7364, 1456, 5824, 0x00000000 +0, 8820, 8820, 1484, 5936, 0x00000000 +0, 10304, 10304, 1456, 5824, 0x0f06f5bb +0, 11760, 11760, 1484, 5936, 0xb0dbfc46 +0, 13244, 13244, 1456, 5824, 0x9daa9f9c +0, 14700, 14700, 1484, 5936, 0x61400d2f +0, 16184, 16184, 1456, 5824, 0x34a5b0e3 +0, 17640, 17640, 1484, 5936, 0x6e546f72 +0, 19124, 19124, 1456, 5824, 0x4f093b35 +0, 20580, 20580, 1484, 5936, 0x95b5b599 +0, 22064, 22064, 1456, 5824, 0x75e15e60 +0, 23520, 23520, 1484, 5936, 0xd1077d39 +0, 25004, 25004, 1456, 5824, 0x956e21ca +0, 26460, 26460, 1484, 5936, 0x33bac234 +0, 27944, 27944, 1456, 5824, 0x5df37824 +0, 29400, 29400, 1484, 5936, 0xc174af24 +0, 30884, 30884, 1456, 5824, 0xe5dc2159 +0, 32340, 32340, 1484, 5936, 0x63ffc8b1 +0, 33824, 33824, 1456, 5824, 0xefe4c365 +0, 35280, 35280, 1484, 5936, 0x2174304d |