aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/matroska.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-06-16 22:59:59 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-06-16 23:01:41 +0200
commit9f91e7deecc16172cad1f2904704ed48ffb0e1b0 (patch)
tree65eff49c2cfc224c37b3f3ee8679b895dbcc2889 /libavformat/matroska.h
parent0a5d22a195b26d83dc823b041054b2a516a6c558 (diff)
parent9e80eda26d06c7c48dbec5dfe643c857c62c0ee7 (diff)
downloadffmpeg-9f91e7deecc16172cad1f2904704ed48ffb0e1b0.tar.gz
Merge commit '9e80eda26d06c7c48dbec5dfe643c857c62c0ee7'
* commit '9e80eda26d06c7c48dbec5dfe643c857c62c0ee7': h264_mp4toannexb_bsf: return a padded buffer Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/matroska.h')
0 files changed, 0 insertions, 0 deletions