diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 11:50:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 11:50:39 +0200 |
| commit | 57f49fa0edafd82315aa3a409ce1051f7dea6981 (patch) | |
| tree | 1b9999a27f951dd24e0961493434043fbd57ba77 /libswresample | |
| parent | 94914d6909908ae48b33485a042db0f867dfeaf0 (diff) | |
| parent | 88d1fb4e3f156d8fd5bb6cb3ba3a9ef1e6d6fb08 (diff) | |
| download | ffmpeg-57f49fa0edafd82315aa3a409ce1051f7dea6981.tar.gz | |
Merge commit '88d1fb4e3f156d8fd5bb6cb3ba3a9ef1e6d6fb08'
* commit '88d1fb4e3f156d8fd5bb6cb3ba3a9ef1e6d6fb08':
filtfmts: Avoid null pointer dereference
Conflicts:
libavfilter/filtfmts.c
See: 24326930d87dd7e851c1cc383bc0682d746ffaf8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample')
0 files changed, 0 insertions, 0 deletions