diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-16 02:27:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-16 02:27:31 +0200 |
| commit | 1cbf7fb4345a3e5b7791d483241bf4759bde4ece (patch) | |
| tree | d7acd8317309e051fb240e3505f77aabe2ea0437 /tests/ref/fate/smacker-video | |
| parent | a48abf5e263ad7f2e68821766e7cf4d29befb58e (diff) | |
| parent | 0ff0af731ce4544f84b2f748dcc699717a2df8d6 (diff) | |
| download | ffmpeg-1cbf7fb4345a3e5b7791d483241bf4759bde4ece.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (26 commits)
fate: use diff -b in oneline comparison
Add missing version bumps and APIchanges/Changelog entries.
lavfi: move buffer management function to a separate file.
lavfi: move formats-related functions from default.c to formats.c
lavfi: move video-related functions to a separate file.
fate: make smjpeg a demux test
fate: separate sierra-vmd audio and video tests
fate: separate smacker audio and video tests
libmp3lame: set supported channel layouts.
avconv: automatically insert asyncts when -async is used.
avconv: add support for audio filters.
lavfi: add asyncts filter.
lavfi: add aformat filter
lavfi: add an audio buffer sink.
lavfi: add an audio buffer source.
buffersrc: add av_buffersrc_write_frame().
buffersrc: fix invalid read in uninit if the fifo hasn't been allocated
lavfi: rename vsrc_buffer.c to buffersrc.c
avfiltergraph: reindent
lavfi: add channel layout/sample rate negotiation.
...
Conflicts:
Changelog
doc/APIchanges
doc/filters.texi
ffmpeg.c
ffprobe.c
libavcodec/libmp3lame.c
libavfilter/Makefile
libavfilter/af_aformat.c
libavfilter/allfilters.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/buffersrc.c
libavfilter/defaults.c
libavfilter/formats.c
libavfilter/src_buffer.c
libavfilter/version.h
libavfilter/vf_yadif.c
libavfilter/vsrc_buffer.c
libavfilter/vsrc_buffer.h
libavutil/avutil.h
tests/fate/audio.mak
tests/fate/demux.mak
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/fate/smacker-video')
| -rw-r--r-- | tests/ref/fate/smacker-video | 101 |
1 files changed, 101 insertions, 0 deletions
diff --git a/tests/ref/fate/smacker-video b/tests/ref/fate/smacker-video new file mode 100644 index 0000000000..8bd307159f --- /dev/null +++ b/tests/ref/fate/smacker-video @@ -0,0 +1,101 @@ +#tb 0: 71/1000 +0, 0, 0, 1, 192000, 0x8926d7fc +0, 1, 1, 1, 192000, 0x2506d384 +0, 2, 2, 1, 192000, 0x9a8dc93a +0, 3, 3, 1, 192000, 0x4badb7f2 +0, 4, 4, 1, 192000, 0xc1fc9631 +0, 5, 5, 1, 192000, 0xfc906592 +0, 6, 6, 1, 192000, 0xeddd28e2 +0, 7, 7, 1, 192000, 0xeee0dcf5 +0, 8, 8, 1, 192000, 0x76798c91 +0, 9, 9, 1, 192000, 0x8a034c1b +0, 10, 10, 1, 192000, 0x4df3127c +0, 11, 11, 1, 192000, 0x2eefd36f +0, 12, 12, 1, 192000, 0x58a2a1d6 +0, 13, 13, 1, 192000, 0x1a3d7971 +0, 14, 14, 1, 192000, 0xa1a65bd5 +0, 15, 15, 1, 192000, 0x344957b9 +0, 16, 16, 1, 192000, 0xe23b5f4e +0, 17, 17, 1, 192000, 0xb5c2710b +0, 18, 18, 1, 192000, 0x7a25938f +0, 19, 19, 1, 192000, 0x0a84e4c9 +0, 20, 20, 1, 192000, 0x94209b0d +0, 21, 21, 1, 192000, 0xf940e51f +0, 22, 22, 1, 192000, 0xb9fdec42 +0, 23, 23, 1, 192000, 0x7b04a376 +0, 24, 24, 1, 192000, 0x5fe0026b +0, 25, 25, 1, 192000, 0x775aca39 +0, 26, 26, 1, 192000, 0xae14fb32 +0, 27, 27, 1, 192000, 0x661106e5 +0, 28, 28, 1, 192000, 0xe8658dbf +0, 29, 29, 1, 192000, 0x5359f0f9 +0, 30, 30, 1, 192000, 0xc1ec80f4 +0, 31, 31, 1, 192000, 0xca53806b +0, 32, 32, 1, 192000, 0xf0766b2e +0, 33, 33, 1, 192000, 0x39962da8 +0, 34, 34, 1, 192000, 0x4171c37f +0, 35, 35, 1, 192000, 0x3abf3b46 +0, 36, 36, 1, 192000, 0xecc68313 +0, 37, 37, 1, 192000, 0xea339baf +0, 38, 38, 1, 192000, 0x616b8f16 +0, 39, 39, 1, 192000, 0xf77a8581 +0, 40, 40, 1, 192000, 0xb315678b +0, 41, 41, 1, 192000, 0x0a4a5218 +0, 42, 42, 1, 192000, 0x98802be4 +0, 43, 43, 1, 192000, 0xa2f0fd94 +0, 44, 44, 1, 192000, 0x6671c84f +0, 45, 45, 1, 192000, 0x38327e31 +0, 46, 46, 1, 192000, 0xb85d3e08 +0, 47, 47, 1, 192000, 0xdc69eba9 +0, 48, 48, 1, 192000, 0x8955a0b3 +0, 49, 49, 1, 192000, 0x714a548b +0, 50, 50, 1, 192000, 0xc0471de9 +0, 51, 51, 1, 192000, 0x2e16e039 +0, 52, 52, 1, 192000, 0x9fa4b033 +0, 53, 53, 1, 192000, 0x4a0f9402 +0, 54, 54, 1, 192000, 0x1f3e6843 +0, 55, 55, 1, 192000, 0x31774850 +0, 56, 56, 1, 192000, 0x9d5336a2 +0, 57, 57, 1, 192000, 0xf7de27a2 +0, 58, 58, 1, 192000, 0x98c717ce +0, 59, 59, 1, 192000, 0x615b10b8 +0, 60, 60, 1, 192000, 0xd5bc0e7e +0, 61, 61, 1, 192000, 0xd5bc0e7e +0, 62, 62, 1, 192000, 0xd5bc0e7e +0, 63, 63, 1, 192000, 0xd5bc0e7e +0, 64, 64, 1, 192000, 0xd5bc0e7e +0, 65, 65, 1, 192000, 0xd5bc0e7e +0, 66, 66, 1, 192000, 0xd5bc0e7e +0, 67, 67, 1, 192000, 0xd5bc0e7e +0, 68, 68, 1, 192000, 0xd5bc0e7e +0, 69, 69, 1, 192000, 0xd5bc0e7e +0, 70, 70, 1, 192000, 0xd5bc0e7e +0, 71, 71, 1, 192000, 0xd5bc0e7e +0, 72, 72, 1, 192000, 0xd5bc0e7e +0, 73, 73, 1, 192000, 0xd5bc0e7e +0, 74, 74, 1, 192000, 0xd5bc0e7e +0, 75, 75, 1, 192000, 0xd5bc0e7e +0, 76, 76, 1, 192000, 0xd5bc0e7e +0, 77, 77, 1, 192000, 0xd5bc0e7e +0, 78, 78, 1, 192000, 0xd5bc0e7e +0, 79, 79, 1, 192000, 0xd5bc0e7e +0, 80, 80, 1, 192000, 0xd5bc0e7e +0, 81, 81, 1, 192000, 0xd5bc0e7e +0, 82, 82, 1, 192000, 0xd5bc0e7e +0, 83, 83, 1, 192000, 0xd5bc0e7e +0, 84, 84, 1, 192000, 0xd5bc0e7e +0, 85, 85, 1, 192000, 0xd5bc0e7e +0, 86, 86, 1, 192000, 0xd5bc0e7e +0, 87, 87, 1, 192000, 0xd5bc0e7e +0, 88, 88, 1, 192000, 0xd5bc0e7e +0, 89, 89, 1, 192000, 0xd5bc0e7e +0, 90, 90, 1, 192000, 0xd5bc0e7e +0, 91, 91, 1, 192000, 0xd5bc0e7e +0, 92, 92, 1, 192000, 0xd5bc0e7e +0, 93, 93, 1, 192000, 0xd5bc0e7e +0, 94, 94, 1, 192000, 0xd5bc0e7e +0, 95, 95, 1, 192000, 0xd5bc0e7e +0, 96, 96, 1, 192000, 0xd5bc0e7e +0, 97, 97, 1, 192000, 0xd5bc0e7e +0, 98, 98, 1, 192000, 0xd5bc0e7e +0, 99, 99, 1, 192000, 0xd5bc0e7e |