diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-10 03:46:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-10 03:46:28 +0100 |
| commit | d9481dcd612b5f020e3c2137c301406a5eb1aa90 (patch) | |
| tree | 079ebab7bc934fa9a9695ca22b3e56e74fe1b26d /libavutil/des.c | |
| parent | 8788d316062e8afe456123a00c594e598fa80408 (diff) | |
| parent | abb5e37f64c48bba8bd0fde2bada0f7544defa24 (diff) | |
| download | ffmpeg-d9481dcd612b5f020e3c2137c301406a5eb1aa90.tar.gz | |
Merge commit 'abb5e37f64c48bba8bd0fde2bada0f7544defa24'
* commit 'abb5e37f64c48bba8bd0fde2bada0f7544defa24':
avfilter: fix leaks on error in ff_filter_frame
Conflicts:
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/des.c')
0 files changed, 0 insertions, 0 deletions