diff options
| author | Yusuke Nakamura <muken.the.vfrmaniac@gmail.com> | 2013-10-12 11:55:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-16 00:17:28 +0200 |
| commit | 53f903b7c5427cb18659f7775714e860c1c5fc39 (patch) | |
| tree | 9cb2181403765e4fd2701851d94aca7c41af2801 /libavformat/isom.c | |
| parent | cf49d0156dfdfbabf3077ddc97eeb0737837d969 (diff) | |
lavf/mov: Support HEVC demuxing.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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 8cbf70b56e..48539e1a2d 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -151,6 +151,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 */ |