[FFmpeg-cvslog] lavf/mpegtsenc: Accept 0x000001 as startcode for hevc.

Carl Eugen Hoyos git at videolan.org
Tue Apr 14 03:17:49 CEST 2015


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Tue Apr 14 01:57:38 2015 +0200| [d0c895d3c58577860324d39d614db03f593e4835] | committer: Carl Eugen Hoyos

lavf/mpegtsenc: Accept 0x000001 as startcode for hevc.

Fixes ticket #4194.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d0c895d3c58577860324d39d614db03f593e4835
---

 libavformat/mpegtsenc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index ae0593d..0251e7a 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -1219,7 +1219,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;



More information about the ffmpeg-cvslog mailing list