diff mbox series

[FFmpeg-devel,15/25] avformat/matroskaenc: Use common function for H.2645 annex B->mp4

Message ID AM7PR03MB66609AA45D0C39A33321D8C88F569@AM7PR03MB6660.eurprd03.prod.outlook.com
State Accepted
Commit f9b8b89b75fa0afa06ed6be1579b80cd73086c33
Headers show
Series [FFmpeg-devel,01/25] avformat/matroskaenc: Fix potential overflow | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_aarch64_jetson success Make finished
andriy/make_fate_aarch64_jetson success Make fate finished
andriy/make_ppc success Make finished
andriy/make_fate_ppc success Make fate finished

Commit Message

Andreas Rheinhardt Jan. 16, 2022, 11:03 p.m. UTC 
Matroska does not have different profiles that allow or disallow
in-band extradata, so one can just use the ordinary H.264 function
for H.265, too. (Both use ff_avc_parse_nal_units() internally anyway.)

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavformat/matroskaenc.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index d275d6cd6c..0446cd6ca9 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -2427,13 +2427,10 @@  static int mkv_write_block(AVFormatContext *s, AVIOContext *pb,
            mkv->cluster_pos, track_number, keyframe != 0);
 
 #if CONFIG_MATROSKA_MUXER
-    if (par->codec_id == AV_CODEC_ID_H264 && par->extradata_size > 0 &&
+    if ((par->codec_id == AV_CODEC_ID_H264 && par->extradata_size > 0 ||
+         par->codec_id == AV_CODEC_ID_HEVC && par->extradata_size > 6) &&
         (AV_RB24(par->extradata) == 1 || AV_RB32(par->extradata) == 1)) {
         err = ff_avc_parse_nal_units_buf(pkt->data, &data, &size);
-    } else if (par->codec_id == AV_CODEC_ID_HEVC && par->extradata_size > 6 &&
-               (AV_RB24(par->extradata) == 1 || AV_RB32(par->extradata) == 1)) {
-        /* extradata is Annex B, assume the bitstream is too and convert it */
-        err = ff_hevc_annexb2mp4_buf(pkt->data, &data, &size, 0, NULL);
     } else
 #endif
     if (track->reformat) {