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/thp | |
| 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/thp')
| -rw-r--r-- | tests/ref/fate/thp | 73 |
1 files changed, 73 insertions, 0 deletions
diff --git a/tests/ref/fate/thp b/tests/ref/fate/thp new file mode 100644 index 0000000000..52dd059027 --- /dev/null +++ b/tests/ref/fate/thp @@ -0,0 +1,73 @@ +#tb 0: 524288/15712911 +0, 0, 0, 1, 291840, 0xbd7e0b22 +0, 1, 1, 1, 291840, 0xf6e12ca5 +0, 2, 2, 1, 291840, 0x528c7049 +0, 3, 3, 1, 291840, 0x93055de9 +0, 4, 4, 1, 291840, 0xf95a51c1 +0, 5, 5, 1, 291840, 0x6ad3a65a +0, 6, 6, 1, 291840, 0x494684a7 +0, 7, 7, 1, 291840, 0x74c14eb1 +0, 8, 8, 1, 291840, 0x149fcb7e +0, 9, 9, 1, 291840, 0x25649761 +0, 10, 10, 1, 291840, 0xbc3f9052 +0, 11, 11, 1, 291840, 0x080edfff +0, 12, 12, 1, 291840, 0x6d7ad684 +0, 13, 13, 1, 291840, 0x6d53844d +0, 14, 14, 1, 291840, 0xf7ad5385 +0, 15, 15, 1, 291840, 0x0241b56a +0, 16, 16, 1, 291840, 0x120122c8 +0, 17, 17, 1, 291840, 0x31b0f32a +0, 18, 18, 1, 291840, 0x14068b98 +0, 19, 19, 1, 291840, 0xeeec658b +0, 20, 20, 1, 291840, 0x9376374c +0, 21, 21, 1, 291840, 0x091e8c6e +0, 22, 22, 1, 291840, 0x744ad07f +0, 23, 23, 1, 291840, 0xf99c554e +0, 24, 24, 1, 291840, 0xc84bd677 +0, 25, 25, 1, 291840, 0x3898d474 +0, 26, 26, 1, 291840, 0x1e2910c8 +0, 27, 27, 1, 291840, 0xb11f58bc +0, 28, 28, 1, 291840, 0xf89170ee +0, 29, 29, 1, 291840, 0x8f239dc3 +0, 30, 30, 1, 291840, 0x8538c76c +0, 31, 31, 1, 291840, 0x162ee66f +0, 32, 32, 1, 291840, 0x5f8708a5 +0, 33, 33, 1, 291840, 0x95802dfb +0, 34, 34, 1, 291840, 0xc424630d +0, 35, 35, 1, 291840, 0xfb8a8667 +0, 36, 36, 1, 291840, 0xbad79af5 +0, 37, 37, 1, 291840, 0xc733b325 +0, 38, 38, 1, 291840, 0x4bfbcd70 +0, 39, 39, 1, 291840, 0x502cd950 +0, 40, 40, 1, 291840, 0x8461ca2c +0, 41, 41, 1, 291840, 0x00219b0d +0, 42, 42, 1, 291840, 0xa4de45e1 +0, 43, 43, 1, 291840, 0xacd3f4df +0, 44, 44, 1, 291840, 0x2203a369 +0, 45, 45, 1, 291840, 0x0a66effa +0, 46, 46, 1, 291840, 0x7ac1fd91 +0, 47, 47, 1, 291840, 0x84970aa7 +0, 48, 48, 1, 291840, 0x569d145f +0, 49, 49, 1, 291840, 0xe51efe1b +0, 50, 50, 1, 291840, 0x38e2cd78 +0, 51, 51, 1, 291840, 0x93428ea2 +0, 52, 52, 1, 291840, 0x3d3f5b17 +0, 53, 53, 1, 291840, 0x9546127d +0, 54, 54, 1, 291840, 0x4178be54 +0, 55, 55, 1, 291840, 0x0d0f8036 +0, 56, 56, 1, 291840, 0xc20557b9 +0, 57, 57, 1, 291840, 0x6d4b2d64 +0, 58, 58, 1, 291840, 0xa750125d +0, 59, 59, 1, 291840, 0x04623ce3 +0, 60, 60, 1, 291840, 0xc7f2bbc7 +0, 61, 61, 1, 291840, 0x6e271336 +0, 62, 62, 1, 291840, 0xcfbd4246 +0, 63, 63, 1, 291840, 0xe1493be9 +0, 64, 64, 1, 291840, 0x6c731194 +0, 65, 65, 1, 291840, 0x0fc30cc2 +0, 66, 66, 1, 291840, 0x967427f3 +0, 67, 67, 1, 291840, 0x55ae3b00 +0, 68, 68, 1, 291840, 0xbe4f200c +0, 69, 69, 1, 291840, 0xc515e443 +0, 70, 70, 1, 291840, 0xd738bd69 +0, 71, 71, 1, 291840, 0xa8e0ab69 |