Merge commit '8d929afd256069aa881f2bf58ef9f0ffce2d6b7e'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Jun 2013 20:51:56 +0000 (22:51 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Jun 2013 20:51:56 +0000 (22:51 +0200)
commit0a5d22a195b26d83dc823b041054b2a516a6c558
treea1da4562adc71de71b48edd32ab51ecd99cb59c9
parent46a5003a4a69b0e8cd824fd058618011d44bf8ef
parent8d929afd256069aa881f2bf58ef9f0ffce2d6b7e
Merge commit '8d929afd256069aa881f2bf58ef9f0ffce2d6b7e'

* commit '8d929afd256069aa881f2bf58ef9f0ffce2d6b7e':
  h264_mp4toannexb_bsf: factor out extradata parsing

Conflicts:
libavcodec/h264_mp4toannexb_bsf.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264_mp4toannexb_bsf.c