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/ea-tgv-2 | |
| 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/ea-tgv-2')
| -rw-r--r-- | tests/ref/fate/ea-tgv-2 | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/tests/ref/fate/ea-tgv-2 b/tests/ref/fate/ea-tgv-2 new file mode 100644 index 0000000000..5e9de02149 --- /dev/null +++ b/tests/ref/fate/ea-tgv-2 @@ -0,0 +1,39 @@ +#tb 0: 1/15 +0, 0, 0, 1, 192000, 0xdfc2f225 +0, 1, 1, 1, 192000, 0x059b57bd +0, 2, 2, 1, 192000, 0x766cb086 +0, 3, 3, 1, 192000, 0x459e3bac +0, 4, 4, 1, 192000, 0x5293e622 +0, 5, 5, 1, 192000, 0x898b03f4 +0, 6, 6, 1, 192000, 0xb184a627 +0, 7, 7, 1, 192000, 0xa3fc650a +0, 8, 8, 1, 192000, 0xea448589 +0, 9, 9, 1, 192000, 0x700e2b76 +0, 10, 10, 1, 192000, 0xa1a1d66d +0, 11, 11, 1, 192000, 0xd63bc8a1 +0, 12, 12, 1, 192000, 0x5f08c023 +0, 13, 13, 1, 192000, 0x8b75ec3b +0, 14, 14, 1, 192000, 0x62728ce4 +0, 15, 15, 1, 192000, 0xaa007941 +0, 16, 16, 1, 192000, 0x55dc5b3b +0, 17, 17, 1, 192000, 0x72d836c2 +0, 18, 18, 1, 192000, 0x1f2de2fc +0, 19, 19, 1, 192000, 0xb295dfdb +0, 20, 20, 1, 192000, 0xe5c5f634 +0, 21, 21, 1, 192000, 0x455a0464 +0, 22, 22, 1, 192000, 0x3bf2340d +0, 23, 23, 1, 192000, 0xe368f0fc +0, 24, 24, 1, 192000, 0xfa7549c0 +0, 25, 25, 1, 192000, 0x4dd76f3d +0, 26, 26, 1, 192000, 0x50a49f6c +0, 27, 27, 1, 192000, 0xb6072f65 +0, 28, 28, 1, 192000, 0x093ce1a8 +0, 29, 29, 1, 192000, 0x55afe3db +0, 30, 30, 1, 192000, 0x81c3bfab +0, 31, 31, 1, 192000, 0x583ebd3d +0, 32, 32, 1, 192000, 0x2504f003 +0, 33, 33, 1, 192000, 0x44ade2af +0, 34, 34, 1, 192000, 0x77cbcfd8 +0, 35, 35, 1, 192000, 0xac7ddfa1 +0, 36, 36, 1, 192000, 0x79f7cfe8 +0, 37, 37, 1, 192000, 0xdf2898fd |