Merge commit 'd68fb1475856cf93199e2bc4eee3063902c35df7'
authorClément Bœsch <u@pkh.me>
Sat, 25 Jun 2016 09:42:57 +0000 (11:42 +0200)
committerClément Bœsch <u@pkh.me>
Sat, 25 Jun 2016 09:42:57 +0000 (11:42 +0200)
commit2ab823d4a6ef1f96961a82fcf5100a5a46917d0e
treed2a4ddcd3810ff9c6b811e1e0973987a593c647f
parent63ac806ccb751bc5aadf70b7fc50a603968c4338
parentd68fb1475856cf93199e2bc4eee3063902c35df7
Merge commit 'd68fb1475856cf93199e2bc4eee3063902c35df7'

* commit 'd68fb1475856cf93199e2bc4eee3063902c35df7':
  mjpegdec: Properly fail on malloc failure

Merged-by: Clément Bœsch <u@pkh.me>
libavcodec/mjpegdec.c