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)
* commit '9e80eda26d06c7c48dbec5dfe643c857c62c0ee7':
  h264_mp4toannexb_bsf: return a padded buffer

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

Simple merge