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-ima-ea-sead | |
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-ima-ea-sead')
-rw-r--r-- | tests/ref/fate/adpcm-ima-ea-sead | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/tests/ref/fate/adpcm-ima-ea-sead b/tests/ref/fate/adpcm-ima-ea-sead new file mode 100644 index 0000000000..17c10875a6 --- /dev/null +++ b/tests/ref/fate/adpcm-ima-ea-sead @@ -0,0 +1,50 @@ +#tb 0: 1/22050 +0, 0, 0, 736, 2944, 0x00000000 +0, 736, 736, 1472, 5888, 0x5ae3c2a4 +0, 2208, 2208, 1472, 5888, 0x158fbcb4 +0, 3680, 3680, 1472, 5888, 0x3fc85d35 +0, 5152, 5152, 1472, 5888, 0x4667ec2b +0, 6624, 6624, 1472, 5888, 0x82744494 +0, 8096, 8096, 1472, 5888, 0x3b0cb86f +0, 9568, 9568, 1472, 5888, 0x29493fbb +0, 11040, 11040, 1472, 5888, 0xaa2d8595 +0, 12512, 12512, 1472, 5888, 0x2e563de6 +0, 13984, 13984, 1472, 5888, 0x225cca99 +0, 15456, 15456, 1472, 5888, 0x2b577599 +0, 16928, 16928, 1472, 5888, 0x3d967f32 +0, 18400, 18400, 1472, 5888, 0x16639a84 +0, 19872, 19872, 1472, 5888, 0x90549ba0 +0, 21344, 21344, 1472, 5888, 0xf46e6644 +0, 22816, 22816, 1472, 5888, 0x39a073ec +0, 24288, 24288, 1472, 5888, 0xb1d7a93a +0, 25760, 25760, 1472, 5888, 0x25e9795b +0, 27232, 27232, 1472, 5888, 0xbbc07644 +0, 28704, 28704, 1472, 5888, 0x323f6a1b +0, 30176, 30176, 1472, 5888, 0x7cae130b +0, 31648, 31648, 1472, 5888, 0xd23bf9c6 +0, 33120, 33120, 1472, 5888, 0x5f73ef35 +0, 34592, 34592, 1472, 5888, 0xc66026be +0, 36064, 36064, 1472, 5888, 0xc8fdb539 +0, 37536, 37536, 1472, 5888, 0x94c6bfbd +0, 39008, 39008, 1472, 5888, 0xb77e1b83 +0, 40480, 40480, 1472, 5888, 0x6c6d6693 +0, 41952, 41952, 1472, 5888, 0xd9f064d4 +0, 43424, 43424, 1472, 5888, 0x85dd990d +0, 44896, 44896, 1472, 5888, 0x385e021b +0, 46368, 46368, 1472, 5888, 0xac09fd02 +0, 47840, 47840, 1472, 5888, 0xc6dcdff2 +0, 49312, 49312, 1472, 5888, 0x86a6944d +0, 50784, 50784, 1472, 5888, 0x8587b964 +0, 52256, 52256, 1472, 5888, 0x2b0355ff +0, 53728, 53728, 1472, 5888, 0xe4148a85 +0, 55200, 55200, 1472, 5888, 0xdf02ed4f +0, 56672, 56672, 1472, 5888, 0x87a54b15 +0, 58144, 58144, 1472, 5888, 0x3ad2be45 +0, 59616, 59616, 1472, 5888, 0x3a49c2c3 +0, 61088, 61088, 1472, 5888, 0xc2b66404 +0, 62560, 62560, 1472, 5888, 0xac3e234a +0, 64032, 64032, 1472, 5888, 0x5dcf523b +0, 65504, 65504, 1472, 5888, 0x2034b5d6 +0, 66976, 66976, 1472, 5888, 0x96882832 +0, 68448, 68448, 1472, 5888, 0x2be3d534 +0, 69920, 69920, 1472, 5888, 0xa841a49d |