diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-23 12:03:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-23 12:19:26 +0100 |
| commit | 2cf521718d9427329b9324b00fb59caddcf42782 (patch) | |
| tree | 3802359d7d10019217a6d63c5ada55c6373a8c96 /tests/ref/fate/canopus-hqx422 | |
| parent | c0f02b220182cc7997bd6b5279881b898f52dfbf (diff) | |
| parent | 35c6ce76b107225a19eb33aea38857d2405882af (diff) | |
| download | ffmpeg-2cf521718d9427329b9324b00fb59caddcf42782.tar.gz | |
Merge commit '35c6ce76b107225a19eb33aea38857d2405882af'
* commit '35c6ce76b107225a19eb33aea38857d2405882af':
Canopus HQX decoder
Conflicts:
Changelog
libavcodec/avcodec.h
libavcodec/version.h
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/fate/canopus-hqx422')
| -rw-r--r-- | tests/ref/fate/canopus-hqx422 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/ref/fate/canopus-hqx422 b/tests/ref/fate/canopus-hqx422 new file mode 100644 index 0000000000..2e1fdf1bfd --- /dev/null +++ b/tests/ref/fate/canopus-hqx422 @@ -0,0 +1,2 @@ +#tb 0: 1/25 +0, 0, 0, 1, 1658880, 0x823fcbac |