Merge commit 'f3ed484953b81856e40239d2410058a96188b2be'

* commit 'f3ed484953b81856e40239d2410058a96188b2be':
  h264_mp4toannexb_bsf: do not fail on annex B extradata

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

diff --cc libavcodec/h264_mp4toannexb_bsf.c
index 828bf18,c65aaeb..163d0f5
--- 1/libavcodec/h264_mp4toannexb_bsf.c
--- 2/libavcodec/h264_mp4toannexb_bsf.c
+++ b/libavcodec/h264_mp4toannexb_bsf.c
@@@ -149,10 -146,11 +155,13 @@@ static int h264_mp4toannexb_init(AVBSFC
              return ret;
  
          s->length_size      = ret;
 -        s->first_idr        = 1;
 +        s->new_idr          = 1;
 +        s->idr_sps_seen     = 0;
 +        s->idr_pps_seen     = 0;
          s->extradata_parsed = 1;
+     } else {
+         av_log(ctx, AV_LOG_ERROR, "Invalid extradata size: %d\n", extra_size);
+         return AVERROR_INVALIDDATA;
      }
  
      return 0;