[FFmpeg-cvslog] lavf/mpegtsenc: fix autobsf when the first NAL is 0x1<XX> bytes

[Rodger Combs]

ffmpeg | branch: master | Rodger Combs <rodger.combs at gmail.com> | Sun Sep 25 14:43:42 2016 -0500| [14fe54bbfb988f4f5a6acb358282640a13162311] | committer: Rodger Combs

lavf/mpegtsenc: fix autobsf when the first NAL is 0x1<XX> bytes

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

 libavformat/mpegtsenc.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index c10a3bf..3ad3de7 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -1790,11 +1790,15 @@ static int mpegts_check_bitstream(struct AVFormatContext *s, const AVPacket *pkt
 
     if (st->codecpar->codec_id == AV_CODEC_ID_H264) {
         if (pkt->size >= 5 && AV_RB32(pkt->data) != 0x0000001 &&
-                              AV_RB24(pkt->data) != 0x000001)
+                             (AV_RB24(pkt->data) != 0x000001 ||
+                              (st->codecpar->extradata_size > 0 &&
+                               st->codecpar->extradata[0] == 1)))
             ret = ff_stream_add_bitstream_filter(st, "h264_mp4toannexb", NULL);
     } else if (st->codecpar->codec_id == AV_CODEC_ID_HEVC) {
         if (pkt->size >= 5 && AV_RB32(pkt->data) != 0x0000001 &&
-                              AV_RB24(pkt->data) != 0x000001)
+                             (AV_RB24(pkt->data) != 0x000001 ||
+                              (st->codecpar->extradata_size > 0 &&
+                               st->codecpar->extradata[0] == 1)))
             ret = ff_stream_add_bitstream_filter(st, "hevc_mp4toannexb", NULL);
     }