[FFmpeg-cvslog] Merge commit 'caf7be30b11288c498fae67be4741bfbf083d977'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  8 22:14:18 2015 +0200| [402b18afcc51b091cf813e3ccaed858d165a7338] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=402b18afcc51b091cf813e3ccaed858d165a7338
---