diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-06 16:50:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-06 16:50:29 +0200 |
| commit | 55376ef978f89141e87fcb72c95ef097c975dce7 (patch) | |
| tree | 8702a4c008b513ab4c12fdda28657be0f8b148d0 /libavcodec/sipr.c | |
| parent | b34afd94ec908c051e1d76be331544e9f425bdcf (diff) | |
| parent | 941972d9e9806e30f978e8fd033671fd30a80a07 (diff) | |
| download | ffmpeg-55376ef978f89141e87fcb72c95ef097c975dce7.tar.gz | |
Merge commit '941972d9e9806e30f978e8fd033671fd30a80a07' into release/2.2
* commit '941972d9e9806e30f978e8fd033671fd30a80a07':
aasc: return correct buffer size from aasc_decode_frame
See: 0be54ad280cf114c02306b7063147e8379f8ed1e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sipr.c')
0 files changed, 0 insertions, 0 deletions