Ticket #3900: 07_fix_avformat_h264_startcode_check.patch

libavformat/mpegtsenc.c

@@ -1145 +1145 @@
 
 int ff_check_h264_startcode(AVFormatContext *s, const AVStream *st, const AVPacket *pkt)
 {
-    if (pkt->size < 5 || AV_RB32(pkt->data) != 0x0000001) {
-        if (!st->nb_frames) {
-            av_log(s, AV_LOG_ERROR, "H.264 bitstream malformed, "
-                   "no startcode found, use the h264_mp4toannexb bitstream filter (-bsf h264_mp4toannexb)\n");
-            return AVERROR(EINVAL);
-        }
-        av_log(s, AV_LOG_WARNING, "H.264 bitstream error, startcode missing\n");
+    if ((pkt->size > 4 && AV_RB32(pkt->data) == 0x00000001) || (pkt->size >= 4 && AV_RB24(pkt->data) == 0x000001))
+        return 0;
+
+    if (!st->nb_frames) {
+        av_log(s, AV_LOG_ERROR, "H.264 bitstream malformed, "
+               "no startcode found, use the h264_mp4toannexb bitstream filter (-bsf h264_mp4toannexb)\n");
+        return AVERROR(EINVAL);
     }
+    av_log(s, AV_LOG_WARNING, "H.264 bitstream error, startcode missing\n");
+
     return 0;
 }