aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/isom.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2015-01-27 15:32:56 +0000
committerVittorio Giovara <vittorio.giovara@gmail.com>2015-02-03 15:23:21 +0000
commit67e9f3907d6d438a413df72d72c1339a0c11a290 (patch)
treedc782f7864c36058f81f867ec7f53f12af63506c /libavformat/isom.c
parente3528d2a7bf29ba148d7ac1678552ce0089cd14f (diff)
downloadffmpeg-67e9f3907d6d438a413df72d72c1339a0c11a290.tar.gz
isom: Decode Prores 4444 XQ with the existing Prores decoder
The frames seem to contain a higher bitrate which our decoder is able to handle. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Diffstat (limited to 'libavformat/isom.c')
-rw-r--r--libavformat/isom.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c
index 5570d264d0..cd532aa23c 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -243,6 +243,7 @@ const AVCodecTag ff_codec_movvideo_tags[] = {
{ AV_CODEC_ID_PRORES, MKTAG('a', 'p', 'c', 's') }, /* Apple ProRes 422 LT */
{ AV_CODEC_ID_PRORES, MKTAG('a', 'p', 'c', 'o') }, /* Apple ProRes 422 Proxy */
{ AV_CODEC_ID_PRORES, MKTAG('a', 'p', '4', 'h') }, /* Apple ProRes 4444 */
+ { AV_CODEC_ID_PRORES, MKTAG('a', 'p', '4', 'x') }, /* Apple ProRes 4444 XQ */
{ AV_CODEC_ID_FLIC, MKTAG('f', 'l', 'i', 'c') },
{ AV_CODEC_ID_AIC, MKTAG('i', 'c', 'o', 'd') },