[FFmpeg-cvslog] Merge commit 'b380337020e271c5431aa8ef8f8e9dfda5e919b2'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jun  9 18:08:41 2015 +0200| [962654f25137ee8a8f75625ee8f5440db060fc9f] | committer: Michael Niedermayer

Merge commit 'b380337020e271c5431aa8ef8f8e9dfda5e919b2'

* commit 'b380337020e271c5431aa8ef8f8e9dfda5e919b2':
  mpjpegdec: don't try to alloc an AVIOContext when probe is guaranteed to fail

See: 1382add59df149193620ca0714ceac0929208c88
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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