Merge commit 'e9ba3098319f78c91470c05da988d865491852c5'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Oct 2014 21:09:06 +0000 (22:09 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Oct 2014 21:09:56 +0000 (22:09 +0100)
* commit 'e9ba3098319f78c91470c05da988d865491852c5':
  assdec: check av_new_packet return value

Conflicts:
libavformat/assdec.c

See: 7c9f9685ae2d45d5bbb939483a01266622e8f14c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge