Merge commit '8a26ae5f94e613dbf7eb8e3c60462e966e409cdc'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 28 Jun 2015 11:41:40 +0000 (13:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 28 Jun 2015 11:41:44 +0000 (13:41 +0200)
commita57ee6cca10d7329a2ce425db1b0a2f49e0971af
tree2667f2171b594b206c2b97a27f71b41004d24cd6
parent30b8f3e7dcd0318b91e205dcbf774ef92fb6193c
parent8a26ae5f94e613dbf7eb8e3c60462e966e409cdc
Merge commit '8a26ae5f94e613dbf7eb8e3c60462e966e409cdc'

* commit '8a26ae5f94e613dbf7eb8e3c60462e966e409cdc':
  mpjpeg: Check stream allocation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mpjpegdec.c