Merge commit 'b9b689550e7531b1a2cc893d2af623e37f266936' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 00:19:35 +0000 (01:19 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 00:19:51 +0000 (01:19 +0100)
commit324797eb83dff7708a464e2ff61dd1551cc5c058
treec6e1614afe0a2301d5c1873a31c8ec220034a44f
parent298f7f1fac0bd3423188f113da875ebfb040bdc8
parentb9b689550e7531b1a2cc893d2af623e37f266936
Merge commit 'b9b689550e7531b1a2cc893d2af623e37f266936' into release/2.4

* commit 'b9b689550e7531b1a2cc893d2af623e37f266936':
  img2dec: check av_new_packet return value

Conflicts:
libavformat/img2dec.c

See: 3f8148911c6e6e1f2a042bd4ca3ad8516a92130c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/img2dec.c