Merge commit '34e7f70f9f493f340daab80eba4f12d005ec3e63' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 00:40:31 +0000 (01:40 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 00:40:50 +0000 (01:40 +0100)
commit6aece62b50cc19280213f91007cbf8d63a9f9432
tree4123c42ef7b81037809f24b4790e194c0ec73926
parentc7831e55b517b44c58e64dddfdde3e542873abfd
parent34e7f70f9f493f340daab80eba4f12d005ec3e63
Merge commit '34e7f70f9f493f340daab80eba4f12d005ec3e63' into release/2.4

* commit '34e7f70f9f493f340daab80eba4f12d005ec3e63':
  assdec: check av_new_packet return value

Conflicts:
libavformat/assdec.c

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