diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-03 22:39:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-03 22:40:46 +0100 |
| commit | acfb4ede2f6b59963381c469fe002c44132f02e6 (patch) | |
| tree | 87505e485db964049d19684dc62904171eec7561 /ffmpeg.h | |
| parent | 94337f8c2dd9aecf5f8bd219431976d5e982a697 (diff) | |
| parent | 6f7a32839d1b913be8170e91c3ac9816b314da21 (diff) | |
| download | ffmpeg-acfb4ede2f6b59963381c469fe002c44132f02e6.tar.gz | |
Merge commit '6f7a32839d1b913be8170e91c3ac9816b314da21'
* commit '6f7a32839d1b913be8170e91c3ac9816b314da21':
svq1enc: correctly handle memory error and allocations
Conflicts:
libavcodec/svq1enc.c
See: 79888388e7c4ca596354f1c093e1c655df7824b8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.h')
0 files changed, 0 insertions, 0 deletions