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

[Carl Eugen Hoyos]

Hi!

Attached patch fixes ticket #4194 for me, I did not look into 
any specification.

Please review, Carl Eugen

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;

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel