Merge commit '1551602b423755c4ed98c5b7b2c2d6504416726e' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 00:09:57 +0000 (01:09 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 00:10:10 +0000 (01:10 +0100)
commit749fadaa651e21540f3c86561be9be9f098ddb44
tree97cd15b417f251e8ddada313bde68bdf68720c6c
parent8120061be26980380c9e786c603ba6d3f4d1109f
parent1551602b423755c4ed98c5b7b2c2d6504416726e
Merge commit '1551602b423755c4ed98c5b7b2c2d6504416726e' into release/2.4

* commit '1551602b423755c4ed98c5b7b2c2d6504416726e':
  nutdec: check av_new_packet return value

Conflicts:
libavformat/nutdec.c

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