diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-12 21:58:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-12 22:01:57 +0100 |
| commit | 8b3a681aaa7dc209faa698c189d9b28c102bdc63 (patch) | |
| tree | 0ad814709cffa98fed8627f565755423f0a1a554 /libavfilter/formats.c | |
| parent | 98c387c9c1cd8337b63e6e6544319127f6e82f94 (diff) | |
| parent | 5a2645cafeca1c2207ac55cc831c3349572a82ed (diff) | |
| download | ffmpeg-8b3a681aaa7dc209faa698c189d9b28c102bdc63.tar.gz | |
Merge commit '5a2645cafeca1c2207ac55cc831c3349572a82ed'
* commit '5a2645cafeca1c2207ac55cc831c3349572a82ed':
nutdec: Prevent leaks on memory error
Conflicts:
libavformat/nutdec.c
See: 269845db86d994c7d43c3ad6eabd4fde5bb391ea
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/formats.c')
0 files changed, 0 insertions, 0 deletions