diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 01:32:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 01:32:12 +0200 |
| commit | 63fdedc79470de309693d7ce7fe75cfcf0a268d8 (patch) | |
| tree | b98a884e41547fc8bd94091dbf8b1f849094e913 /libswscale | |
| parent | 0f69f02eb746124536a81effe9000a4dc876c7d8 (diff) | |
| parent | 074a1b37325bf6d1483fc23ebf1255e78d998339 (diff) | |
| download | ffmpeg-63fdedc79470de309693d7ce7fe75cfcf0a268d8.tar.gz | |
Merge commit '074a1b37325bf6d1483fc23ebf1255e78d998339'
* commit '074a1b37325bf6d1483fc23ebf1255e78d998339':
aacpsy: Check memory allocation
Conflicts:
libavcodec/aacpsy.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
0 files changed, 0 insertions, 0 deletions