Merge commit '9e80eda26d06c7c48dbec5dfe643c857c62c0ee7'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Jun 2013 20:59:59 +0000 (22:59 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Jun 2013 21:01:41 +0000 (23:01 +0200)
commit9f91e7deecc16172cad1f2904704ed48ffb0e1b0
tree65eff49c2cfc224c37b3f3ee8679b895dbcc2889
parent0a5d22a195b26d83dc823b041054b2a516a6c558
parent9e80eda26d06c7c48dbec5dfe643c857c62c0ee7
Merge commit '9e80eda26d06c7c48dbec5dfe643c857c62c0ee7'

* commit '9e80eda26d06c7c48dbec5dfe643c857c62c0ee7':
  h264_mp4toannexb_bsf: return a padded buffer

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