diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-03 22:28:25 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-03 22:29:04 +0100 |
commit | 94337f8c2dd9aecf5f8bd219431976d5e982a697 (patch) | |
tree | bd1389a16d74a71632bfb36ed90db868733e5a44 /ffmpeg.h | |
parent | e005dc621ab9571b03d7cf2c3a6248153f745ec9 (diff) | |
parent | 67e9f3907d6d438a413df72d72c1339a0c11a290 (diff) | |
download | ffmpeg-94337f8c2dd9aecf5f8bd219431976d5e982a697.tar.gz |
Merge commit '67e9f3907d6d438a413df72d72c1339a0c11a290'
* commit '67e9f3907d6d438a413df72d72c1339a0c11a290':
isom: Decode Prores 4444 XQ with the existing Prores decoder
See: fe47cba7e8daa987ac8c802362d8dad892858cd5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.h')
0 files changed, 0 insertions, 0 deletions