diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-13 19:59:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-13 19:59:41 +0200 |
| commit | fb6dd77000f1ad6740494269f55a0ff21df5bcf2 (patch) | |
| tree | 35c3a454ba49c5229bb894de0e6b90c7c50c6fcd /libavcodec/sanm.c | |
| parent | f4f3065c69cefd916c92ee2a8758bac799a30c00 (diff) | |
| parent | 73dacabfc9b9ef1fd2c08105fdab6238ee29c2fc (diff) | |
| download | ffmpeg-fb6dd77000f1ad6740494269f55a0ff21df5bcf2.tar.gz | |
Merge commit '73dacabfc9b9ef1fd2c08105fdab6238ee29c2fc'
* commit '73dacabfc9b9ef1fd2c08105fdab6238ee29c2fc':
ffv1: Check memory allocations
Conflicts:
libavcodec/ffv1.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sanm.c')
0 files changed, 0 insertions, 0 deletions