diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 22:31:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 22:31:55 +0100 |
| commit | ce1ad8d775ba74f2ab03675043116be3c305fcb1 (patch) | |
| tree | 04cf6551093021ccaacd899e9ece78f96926c5ed /libavformat/isom.c | |
| parent | 7a69ffaf0df4e71837f0d2c2115d73fa3c95dcc6 (diff) | |
| parent | 1d9014f0b008485eac4c19d5f5e11ede59237167 (diff) | |
| download | ffmpeg-ce1ad8d775ba74f2ab03675043116be3c305fcb1.tar.gz | |
Merge commit '1d9014f0b008485eac4c19d5f5e11ede59237167'
* commit '1d9014f0b008485eac4c19d5f5e11ede59237167':
movenc: use 'hev1' tag for HEVC in MODE_MOV.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/isom.c')
| -rw-r--r-- | libavformat/isom.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c index f7540ebb55..e568702464 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -151,8 +151,8 @@ 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_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', 'i', '5', 'p') }, /* AVC-Intra 50M 720p24/30/60 */ |