diff options
| author | Sven Gothel <[email protected]> | 2017-12-25 23:53:54 +0100 |
|---|---|---|
| committer | Bradley Sepos <[email protected]> | 2018-05-28 23:56:18 -0400 |
| commit | 2326243b027a6341285bbfee9d99bc23567e2b5e (patch) | |
| tree | 518164dfa7a3d195ded39672c11d823526694c43 /contrib/ffmpeg/A20-avc3-hvc1-override.patch | |
| parent | 6c5faa037d2955421dd7bae44f6f5f15b9b011a2 (diff) | |
FFMPEG #974: Use latest FFMPEG 3.4.1 (2/2)
Patch 2/2 for https://github.com/HandBrake/HandBrake/issues/974
moving to FFMPEG 3.4.1 from LIBAV 12.2.
All patches have been moved to subfolder 'old' since they do not apply cleanly anymore.
Work has to be performed to validate whether patches are still required.
Diffstat (limited to 'contrib/ffmpeg/A20-avc3-hvc1-override.patch')
| -rw-r--r-- | contrib/ffmpeg/A20-avc3-hvc1-override.patch | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/contrib/ffmpeg/A20-avc3-hvc1-override.patch b/contrib/ffmpeg/A20-avc3-hvc1-override.patch deleted file mode 100644 index 70d67b4a3..000000000 --- a/contrib/ffmpeg/A20-avc3-hvc1-override.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -ur libav-12.2.orig/libavformat/isom.c libav-12.2/libavformat/isom.c ---- libav-12.2.orig/libavformat/isom.c 2017-09-30 11:13:39.000000000 -0700 -+++ libav-12.2/libavformat/isom.c 2017-11-01 14:17:30.762856002 -0700 -@@ -152,6 +152,7 @@ - { 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', 'v', 'c', '3') }, /* 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 */ - { AV_CODEC_ID_H264, MKTAG('a', 'i', '5', '2') }, /* AVC-Intra 50M 1080p25/50 */ -diff -ur libav-12.2.orig/libavformat/movenc.c libav-12.2/libavformat/movenc.c ---- libav-12.2.orig/libavformat/movenc.c 2017-09-30 11:13:39.000000000 -0700 -+++ libav-12.2/libavformat/movenc.c 2017-11-01 14:20:52.783487291 -0700 -@@ -724,7 +724,10 @@ - - 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); - } - -@@ -783,7 +786,11 @@ - if (!ff_codec_get_tag(ff_mp4_obj_type, track->par->codec_id)) - return 0; - -- if (track->par->codec_id == AV_CODEC_ID_H264) tag = MKTAG('a','v','c','1'); -+ if (track->par->codec_id == AV_CODEC_ID_H264 && -+ tag == MKTAG('a','v','c','3')) ; -+ else if (track->par->codec_id == AV_CODEC_ID_H264) tag = MKTAG('a','v','c','1'); -+ else if (track->par->codec_id == AV_CODEC_ID_HEVC && -+ tag == MKTAG('h','v','c','1')) ; - else if (track->par->codec_id == AV_CODEC_ID_HEVC) tag = MKTAG('h','e','v','1'); - else if (track->par->codec_id == AV_CODEC_ID_AC3) tag = MKTAG('a','c','-','3'); - else if (track->par->codec_id == AV_CODEC_ID_DIRAC) tag = MKTAG('d','r','a','c'); -@@ -4476,7 +4483,7 @@ - .write_packet = mov_write_packet, - .write_trailer = mov_write_trailer, - .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH | AVFMT_TS_NEGATIVE, -- .codec_tag = (const AVCodecTag* const []){ ff_mp4_obj_type, 0 }, -+ .codec_tag = (const AVCodecTag* const []){ ff_codec_movvideo_tags, ff_codec_movaudio_tags, ff_codec_movsubtitle_tags, 0 }, - .priv_class = &mp4_muxer_class, - }; - #endif -Only in libav-12.2/libavformat: movenc.c.orig |