Merge commit 'caf7be30b11288c498fae67be4741bfbf083d977'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Jun 2015 20:14:18 +0000 (22:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Jun 2015 20:15:28 +0000 (22:15 +0200)
commit402b18afcc51b091cf813e3ccaed858d165a7338
tree68c712312b9cfa2a61773f11be23aad52484472e
parent83e3516e64dcc1581ae7503be3aaca6a34be7194
parentcaf7be30b11288c498fae67be4741bfbf083d977
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>
libavformat/mpjpegdec.c