diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-12 11:55:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-12 11:55:08 +0200 |
| commit | d510d70df02b3769a184daa355a461d9c9f51e18 (patch) | |
| tree | 185f5ffcc952359864fa81d69b8ca5405f7edd0a /libavfilter/trim.c | |
| parent | c16cd555934999a22d1f0a87d4ceea2b31ccefe6 (diff) | |
| parent | d002fce24a7206e95f9492031f45adc35711e183 (diff) | |
| download | ffmpeg-d510d70df02b3769a184daa355a461d9c9f51e18.tar.gz | |
Merge commit 'd002fce24a7206e95f9492031f45adc35711e183'
* commit 'd002fce24a7206e95f9492031f45adc35711e183':
smacker: Check malloc return values
Conflicts:
libavcodec/smacker.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/trim.c')
0 files changed, 0 insertions, 0 deletions