diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-12 22:39:27 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-12 22:40:56 +0100 |
| commit | 9f8f2bcab6267be2054211dab9d5824af5517201 (patch) | |
| tree | a18789bca7ccd31d58d7413ae6aef312880abac7 /ffmpeg.h | |
| parent | 8b3a681aaa7dc209faa698c189d9b28c102bdc63 (diff) | |
| parent | c3bd1d60af97e8d2568dac9fcce7bdabb4ff93c8 (diff) | |
| download | ffmpeg-9f8f2bcab6267be2054211dab9d5824af5517201.tar.gz | |
Merge commit 'c3bd1d60af97e8d2568dac9fcce7bdabb4ff93c8'
* commit 'c3bd1d60af97e8d2568dac9fcce7bdabb4ff93c8':
formats: Check memory allocations
Conflicts:
libavfilter/formats.c
See: 527ca3985c736ffe077a82fdf3616f0fd571b923
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.h')
0 files changed, 0 insertions, 0 deletions