summaryrefslogtreecommitdiff
path: root/libavformat/movenc.c
diff options
context:
space:
mode:
authorJohn Stebbins <stebbins@jetheaddev.com>2017-06-15 11:41:15 -0700
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>2017-07-05 15:55:25 -0400
commit974d508e571085dce43e688595da058804169088 (patch)
tree26f70846a9a27515c31ee2bbbcc044d21ebbe196 /libavformat/movenc.c
parent38d808d72e393f9a769ef1543a7eff15fadc1980 (diff)
movenc: write correct format hvcc when tag is hvc1
(cherry picked from commit 1ea9b7fdf99b60c0db95a2ce97b2108469bbb245) Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavformat/movenc.c')
-rw-r--r--libavformat/movenc.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index b0ae6bf12d..e7234ac27b 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -1126,7 +1126,10 @@ static int mov_write_hvcc_tag(AVIOContext *pb, MOVTrack *track)
avio_wb32(pb, 0);
ffio_wfourcc(pb, "hvcC");
- ff_isom_write_hvcc(pb, track->vos_data, track->vos_len, 0);
+ if (track->tag == MKTAG('h','v','c','1'))
+ ff_isom_write_hvcc(pb, track->vos_data, track->vos_len, 1);
+ else
+ ff_isom_write_hvcc(pb, track->vos_data, track->vos_len, 0);
return update_size(pb, pos);
}