mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit 'caf7be30b11288c498fae67be4741bfbf083d977'
* commit 'caf7be30b11288c498fae67be4741bfbf083d977':
mpjpgdec: free AVIOContext leak on early probe fail
Conflicts:
libavformat/mpjpegdec.c
See: 34d278f983
, this was mistakenly reimplemented, also see ffmpeg IRC log of today
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
402b18afcc
|
@ -101,8 +101,8 @@ static int mpjpeg_read_probe(AVProbeData *p)
|
|||
break;
|
||||
}
|
||||
}
|
||||
|
||||
end:
|
||||
|
||||
av_free(pb);
|
||||
|
||||
return ret;
|
||||
|
|
Loading…
Reference in New Issue