aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-03-12 16:31:21 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-03-12 16:31:21 +0100
commitbf780b7ea8d9420e39f59d565d283806c31de193 (patch)
tree7e442e73438ccd8a69278cc7d3680b9365c41623 /doc
parentb52421940f5c764237d484c5d578ebc2b1c136c5 (diff)
parent19dd4017ab6dac11c77d797acebee4f60ad63a6f (diff)
downloadffmpeg-bf780b7ea8d9420e39f59d565d283806c31de193.tar.gz
Merge commit '19dd4017ab6dac11c77d797acebee4f60ad63a6f'
* commit '19dd4017ab6dac11c77d797acebee4f60ad63a6f': libopencore-amr: Add the missing 3rd argument of ff_get_buffer() vmdaudio: fix invalid reads when packet size is not a multiple of chunk size wmaprodec: return an error, not 0, when the input is too small. Conflicts: libavcodec/vmdav.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions