generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'caf7be30b11288c498fae67be4741bfbf083d977'

Browse Source 
* 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:
Michael Niedermayer
2015-06-08 22:14:18 +02:00
parent 83e3516e64 caf7be30b1
commit 402b18afcc
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/mpjpegdec.c
View File

@@ -101,8 +101,8 @@ static int mpjpeg_read_probe(AVProbeData *p)
break; break;
} }
} }
end: end:
av_free(pb); av_free(pb);
return ret; return ret;