diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 14:47:51 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 14:47:51 +0400 |
| commit | 3aee1fa5b65086da4bb151f3cdfd89389d8b0ff9 (patch) | |
| tree | 706cde736c279d270829a55b4dd5094ffcecf553 /libavformat | |
| parent | 89a9c84ebb1292a631b0895b80cddb9d0ba8ad0f (diff) | |
| parent | ea3309eba715e83027e8ece4a226e39a4bf2a6ce (diff) | |
Merge commit 'ea3309eba715e83027e8ece4a226e39a4bf2a6ce' into release/2.2
* commit 'ea3309eba715e83027e8ece4a226e39a4bf2a6ce':
movenc: use 'hev1' tag for HEVC in MODE_MOV.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -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 f234197927..b7f8fa9c80 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 */ |