[FFmpeg-devel] Accept 0x000001 as startcode for hevc in mpegts

[Ali KIZIL]

Hello All,

There is ticket #4194:
https://trac.ffmpeg.org/ticket/4194

On the below link, there is already working solution:
https://ffmpeg.org/pipermail/ffmpeg-devel/2014-December/166753.html

-------------- next part --------------
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index a32c6d6..ff15d16 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -1207,7 +1207,7 @@ int ff_check_h264_startcode(AVFormatContext *s, 
const AVStream *st, const AVPack
 
 static int check_hevc_startcode(AVFormatContext *s, const AVStream *st, 
const AVPacket *pkt)
 {
-    if (pkt->size < 5 || AV_RB32(pkt->data) != 0x0000001) {
+    if (pkt->size < 5 || (AV_RB32(pkt->data) != 0x0000001 && 
AV_RB24(pkt->data) != 0x000001)) {
         if (!st->nb_frames) {
             av_log(s, AV_LOG_ERROR, "HEVC bitstream malformed, no 
startcode found\n");
             return AVERROR_PATCHWELCOME;

This update fixes many unnecessary (according to me) log info.

(I am not expert on commiting changes, so I wrote here.)