diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-06 03:06:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-06 03:07:10 +0200 |
| commit | 4ba11b944e46e6d53bce3f5869e1d4edc31f8c3d (patch) | |
| tree | c9a80bf7762f87ce09673d682bfc5b94e67d4a3e /libavutil/mem.c | |
| parent | de7b74d2544d2cb5ff85db20a9853116ea72ed47 (diff) | |
| parent | 0d3a7dd26490156b607541dd2e1faeaa0fc61a88 (diff) | |
| download | ffmpeg-4ba11b944e46e6d53bce3f5869e1d4edc31f8c3d.tar.gz | |
Merge commit '0d3a7dd26490156b607541dd2e1faeaa0fc61a88' into release/2.4
* commit '0d3a7dd26490156b607541dd2e1faeaa0fc61a88':
aasc: return correct buffer size from aasc_decode_frame
See: 0be54ad280cf114c02306b7063147e8379f8ed1e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/mem.c')
0 files changed, 0 insertions, 0 deletions