diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 22:14:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 22:15:28 +0200 |
| commit | 402b18afcc51b091cf813e3ccaed858d165a7338 (patch) | |
| tree | 68c712312b9cfa2a61773f11be23aad52484472e /libavformat/webpenc.c | |
| parent | 83e3516e64dcc1581ae7503be3aaca6a34be7194 (diff) | |
| parent | caf7be30b11288c498fae67be4741bfbf083d977 (diff) | |
| download | ffmpeg-402b18afcc51b091cf813e3ccaed858d165a7338.tar.gz | |
Merge commit 'caf7be30b11288c498fae67be4741bfbf083d977'
* commit 'caf7be30b11288c498fae67be4741bfbf083d977':
mpjpgdec: free AVIOContext leak on early probe fail
Conflicts:
libavformat/mpjpegdec.c
See: 34d278f9838e355b3b2c7a9c0f77d7fcaf37ce49, this was mistakenly reimplemented, also see ffmpeg IRC log of today
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/webpenc.c')
0 files changed, 0 insertions, 0 deletions