diff options
| author | Yusuke Nakamura <muken.the.vfrmaniac@gmail.com> | 2013-10-03 14:03:53 +0900 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-10-31 20:20:32 +0100 |
| commit | ea29f965dc71182f77b8efe819630f55e48b0ab7 (patch) | |
| tree | e04eb5dfeee019a896ddf94cbdc6ca5a4bdf060a /libavformat/isom.c | |
| parent | 5846646296e377e093441dfe9eadde38ff1f7c99 (diff) | |
mov: Support HEVC demuxing
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavformat/isom.c')
| -rw-r--r-- | libavformat/isom.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c index 014096d95d..372e877ff0 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -136,6 +136,9 @@ const AVCodecTag ff_codec_movvideo_tags[] = { { AV_CODEC_ID_RAWVIDEO, MKTAG('W', 'R', 'A', 'W') }, + { AV_CODEC_ID_HEVC, MKTAG('h', 'v', 'c', '1') }, /* HEVC/H.265 which indicates parameter sets shall not be in ES */ + { AV_CODEC_ID_HEVC, MKTAG('h', 'e', 'v', '1') }, /* HEVC/H.265 which indicates parameter sets may be in ES */ + { AV_CODEC_ID_H264, MKTAG('a', 'v', 'c', '1') }, /* AVC-1/H.264 */ { 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 */ |