summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2013-10-18 07:50:50 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-10-18 15:41:34 +0200
commit5b9f39860d83380c4af3039710b4fcf3ea1f4c99 (patch)
treedac73538bd0f64f4f75160fc802acee775f20279 /libavformat
parenta6881765358bc9d00b2a354adbca2d97dc0093d0 (diff)
Support 4k AVC-Intra in mov.
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/isom.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c
index 48539e1a2d..a8ff01dba5 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -167,6 +167,7 @@ const AVCodecTag ff_codec_movvideo_tags[] = {
{ AV_CODEC_ID_H264, MKTAG('a', 'i', '1', '3') }, /* AVC-Intra 100M 1080p24/30/60 */
{ AV_CODEC_ID_H264, MKTAG('a', 'i', '1', '5') }, /* AVC-Intra 100M 1080i50 */
{ AV_CODEC_ID_H264, MKTAG('a', 'i', '1', '6') }, /* AVC-Intra 100M 1080i60 */
+ { AV_CODEC_ID_H264, MKTAG('a', 'i', 'v', 'x') }, /* AVC-Intra 200M 4kp24 */
{ AV_CODEC_ID_H264, MKTAG('A', 'V', 'i', 'n') }, /* AVC-Intra with implicit SPS/PPS */
{ AV_CODEC_ID_MPEG1VIDEO, MKTAG('m', '1', 'v', '1') }, /* Apple MPEG-1 Camcorder */