diff options
author | John Stebbins <stebbins@jetheaddev.com> | 2017-06-15 11:47:16 -0700 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2017-07-05 15:55:25 -0400 |
commit | 369a3e111cb8015c3a3acc5c2c15728c8f37084f (patch) | |
tree | 7b9a94ad7b950071b977ac5c45e40a83a31bcd09 /libavformat | |
parent | 974d508e571085dce43e688595da058804169088 (diff) | |
download | ffmpeg-streaming-369a3e111cb8015c3a3acc5c2c15728c8f37084f.zip ffmpeg-streaming-369a3e111cb8015c3a3acc5c2c15728c8f37084f.tar.gz |
movenc: allow alternative hvc1 h.265 codec tag
If AVCodecParameters.codec_tag is 'hvc1' use it instead of 'hev1' for
h.265 streams. QuickTime (and other Apple software) requires 'hvc1'.
(cherry picked from commit 84ab1cc437fa47a00532f305b9fe15b5b66c8c5e)
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/movenc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index e7234ac..88f2f2c 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -6437,6 +6437,7 @@ const AVCodecTag codec_mp4_tags[] = { { AV_CODEC_ID_MPEG4 , MKTAG('m', 'p', '4', 'v') }, { AV_CODEC_ID_H264 , MKTAG('a', 'v', 'c', '1') }, { AV_CODEC_ID_HEVC , MKTAG('h', 'e', 'v', '1') }, + { AV_CODEC_ID_HEVC , MKTAG('h', 'v', 'c', '1') }, { AV_CODEC_ID_MPEG2VIDEO , MKTAG('m', 'p', '4', 'v') }, { AV_CODEC_ID_MPEG1VIDEO , MKTAG('m', 'p', '4', 'v') }, { AV_CODEC_ID_MJPEG , MKTAG('m', 'p', '4', 'v') }, |