diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-14 03:43:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-14 03:48:22 +0200 |
| commit | 91eb1b1525456efecc3154ca533b943d2916886e (patch) | |
| tree | 34eb85a4cd6dbc0badfddc3da33038798da9d40a /tests/ref/fate | |
| parent | 90705aabe1a0b947d25f2a1d5fcbad85cfdfbc2c (diff) | |
| parent | a62d36697d3cefc705736d21fcaede425147b5f0 (diff) | |
| download | ffmpeg-91eb1b1525456efecc3154ca533b943d2916886e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (22 commits)
prores: add FATE tests
id3v2: reduce the scope of some non-globally-used symbols/structures
id3v2: cosmetics: move some declarations before the places they are used
shorten: remove the flush function.
shn: do not allow seeking in the raw shn demuxer.
avformat: add AVInputFormat flag AVFMT_NO_BYTE_SEEK.
avformat: update AVInputFormat allowed flags
avformat: don't unconditionally call ff_read_frame_flush() when trying to seek.
truespeech: use sizeof() instead of hardcoded sizes
truespeech: remove unneeded variable, 'consumed'
truespeech: simplify truespeech_read_frame() by using get_bits()
truespeech: decode directly to output buffer instead of a temp buffer
truespeech: check to make sure channels == 1
truespeech: check for large enough output buffer rather than truncating output
truespeech: remove unneeded zero-size packet check.
mlpdec: return meaningful error codes instead of -1
mlpdec: remove unnecessary wrapper function
mlpdec: only calculate output size once
mlpdec: validate that the reported channel count matches the actual output channel count
pcm: reduce pointer type casting
...
Conflicts:
libavformat/avformat.h
libavformat/id3v2.c
libavformat/id3v2.h
libavformat/utils.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/fate')
| -rw-r--r-- | tests/ref/fate/prores-422 | 2 | ||||
| -rw-r--r-- | tests/ref/fate/prores-422_hq | 2 | ||||
| -rw-r--r-- | tests/ref/fate/prores-422_lt | 2 | ||||
| -rw-r--r-- | tests/ref/fate/prores-422_proxy | 2 | ||||
| -rw-r--r-- | tests/ref/fate/prores-alpha | 2 |
5 files changed, 10 insertions, 0 deletions
diff --git a/tests/ref/fate/prores-422 b/tests/ref/fate/prores-422 new file mode 100644 index 0000000000..8d6f3ab517 --- /dev/null +++ b/tests/ref/fate/prores-422 @@ -0,0 +1,2 @@ +0, 0, 8294400, 0xe8e9d448 +0, 3003, 8294400, 0xe8e9d448 diff --git a/tests/ref/fate/prores-422_hq b/tests/ref/fate/prores-422_hq new file mode 100644 index 0000000000..8ce6937cf5 --- /dev/null +++ b/tests/ref/fate/prores-422_hq @@ -0,0 +1,2 @@ +0, 0, 8294400, 0x817063b0 +0, 3003, 8294400, 0x817063b0 diff --git a/tests/ref/fate/prores-422_lt b/tests/ref/fate/prores-422_lt new file mode 100644 index 0000000000..e9d0437568 --- /dev/null +++ b/tests/ref/fate/prores-422_lt @@ -0,0 +1,2 @@ +0, 0, 8294400, 0xcd4ccde1 +0, 3003, 8294400, 0xcd4ccde1 diff --git a/tests/ref/fate/prores-422_proxy b/tests/ref/fate/prores-422_proxy new file mode 100644 index 0000000000..c9e454fd61 --- /dev/null +++ b/tests/ref/fate/prores-422_proxy @@ -0,0 +1,2 @@ +0, 0, 8294400, 0x51d29320 +0, 3003, 8294400, 0x51d29320 diff --git a/tests/ref/fate/prores-alpha b/tests/ref/fate/prores-alpha new file mode 100644 index 0000000000..2e17020548 --- /dev/null +++ b/tests/ref/fate/prores-alpha @@ -0,0 +1,2 @@ +0, 0, 8294400, 0xee48d74b +0, 3003, 8294400, 0x2a0c7eb1 |