diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 05:36:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 05:36:20 +0100 |
| commit | 8ccfafa7b41b8239cfbbaa5dfd8eea8a300c64be (patch) | |
| tree | c787802f60916e7a7ea2b2413e22c5546cb712e9 /libavcodec/imgconvert.c | |
| parent | 8c9a23833daa88bdf08b7e7fbf3a64ab689ad373 (diff) | |
| parent | 596b5c488fa1d40f114a64d3b73e1863cab073fb (diff) | |
| download | ffmpeg-8ccfafa7b41b8239cfbbaa5dfd8eea8a300c64be.tar.gz | |
Merge commit '596b5c488fa1d40f114a64d3b73e1863cab073fb'
* commit '596b5c488fa1d40f114a64d3b73e1863cab073fb':
wma: check memory allocations and propagate errors
Conflicts:
libavcodec/wma.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/imgconvert.c')
0 files changed, 0 insertions, 0 deletions