diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-30 03:46:24 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-30 03:46:24 +0100 |
commit | 00c0465dbc5acd27c736d612bbad95fdbe2ef96c (patch) | |
tree | cf193c53844909c70470cf23c3b95c7f218b3547 /tests/ref/fate/vc1_sa10091 | |
parent | 6ed3565f08abf3b1c2a1d2d7fac768b18753530c (diff) | |
parent | 209c44526700b1bac04b9fe97c8a8fdcfbeeba00 (diff) | |
download | ffmpeg-00c0465dbc5acd27c736d612bbad95fdbe2ef96c.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: split off DPCM codec FATE tests into their own file
fate: split off PCM codec FATE tests into their own file
libvorbis: K&R reformatting cosmetics
libmp3lame: K&R formatting cosmetics
fate: Add a video test for xxan decoder
mpegvideo_enc: K&R cosmetics (line 1000-2000).
avconv: K&R cosmetics
qt-faststart: Fix up indentation
indeo4: remove two unused variables
doxygen: cleanup style to support older doxy
fate: add more tests for VC-1 decoder
applehttpproto: Apply the same reload interval changes as for the demuxer
applehttp: Use half the target duration as interval if the playlist didn't update
applehttp: Use the last segment duration as reload interval
lagarith: add decode support for arith rgb24 mode
Conflicts:
avconv.c
libavcodec/libmp3lame.c
libavcodec/mpegvideo_enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/fate/vc1_sa10091')
-rw-r--r-- | tests/ref/fate/vc1_sa10091 | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/tests/ref/fate/vc1_sa10091 b/tests/ref/fate/vc1_sa10091 new file mode 100644 index 0000000000..c121090097 --- /dev/null +++ b/tests/ref/fate/vc1_sa10091 @@ -0,0 +1,30 @@ +0, 0, 518400, 0xae20b4fa +0, 3600, 518400, 0x2b4ccdf9 +0, 7200, 518400, 0x2b4ccdf9 +0, 10800, 518400, 0x2b4ccdf9 +0, 14400, 518400, 0x2b4ccdf9 +0, 18000, 518400, 0x2b4ccdf9 +0, 21600, 518400, 0x70d9a891 +0, 25200, 518400, 0x70d9a891 +0, 28800, 518400, 0x70d9a891 +0, 32400, 518400, 0xa461ee86 +0, 36000, 518400, 0x722bc6e8 +0, 39600, 518400, 0x722bc6e8 +0, 43200, 518400, 0x722bc6e8 +0, 46800, 518400, 0xf752fd2c +0, 50400, 518400, 0xf752fd2c +0, 54000, 518400, 0x91abcaca +0, 57600, 518400, 0x572727c3 +0, 61200, 518400, 0x572727c3 +0, 64800, 518400, 0x24c12382 +0, 68400, 518400, 0x24c12382 +0, 72000, 518400, 0x9aa39fe8 +0, 75600, 518400, 0x9aa39fe8 +0, 79200, 518400, 0x5cb6bd19 +0, 82800, 518400, 0x704d9300 +0, 86400, 518400, 0x590fad49 +0, 90000, 518400, 0x590fad49 +0, 93600, 518400, 0x590fad49 +0, 97200, 518400, 0x46bea10b +0, 100800, 518400, 0x46bea10b +0, 104400, 518400, 0x46bea10b |