summaryrefslogtreecommitdiffstats
path: root/libavformat/isom.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2016-02-04 17:40:06 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2016-02-04 17:40:06 +0100
commita36c737490d981cfad90164fb4e58902774d4414 (patch)
treeb8f541cc9034c5f1f1e4a9f5d142a101124bdb99 /libavformat/isom.c
parentf89bc661b429e02dc244c5b0e1a4441c6f72a9ec (diff)
downloadffmpeg-streaming-a36c737490d981cfad90164fb4e58902774d4414.zip
ffmpeg-streaming-a36c737490d981cfad90164fb4e58902774d4414.tar.gz
lavf/isom: Add more code points for H264.
Defined by the MP4 registration authority. Fixes ticket #5217.
Diffstat (limited to 'libavformat/isom.c')
-rw-r--r--libavformat/isom.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c
index e55738b..2ca1265 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -160,6 +160,9 @@ const AVCodecTag ff_codec_movvideo_tags[] = {
{ AV_CODEC_ID_HEVC, MKTAG('h', 'v', 'c', '1') }, /* HEVC/H.265 which indicates parameter sets shall not be in ES */
{ AV_CODEC_ID_H264, MKTAG('a', 'v', 'c', '1') }, /* AVC-1/H.264 */
+ { AV_CODEC_ID_H264, MKTAG('a', 'v', 'c', '2') },
+ { AV_CODEC_ID_H264, MKTAG('a', 'v', 'c', '3') },
+ { AV_CODEC_ID_H264, MKTAG('a', 'v', 'c', '4') },
{ AV_CODEC_ID_H264, MKTAG('a', 'i', '5', 'p') }, /* AVC-Intra 50M 720p24/30/60 */
{ AV_CODEC_ID_H264, MKTAG('a', 'i', '5', 'q') }, /* AVC-Intra 50M 720p25/50 */
{ AV_CODEC_ID_H264, MKTAG('a', 'i', '5', '2') }, /* AVC-Intra 50M 1080p25/50 */
OpenPOWER on IntegriCloud