Merge commit '7207dd8f829baee58b4df6c97c19ffde77039e8d'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Oct 2014 20:48:19 +0000 (22:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Oct 2014 21:01:26 +0000 (23:01 +0200)
commit840bc8e284c8eead7f0f319e846f911dfb3fd48f
tree6e11272c19fbcc503d168955a50a8f49cc7d7ecd
parent6aa1cfed0b2266bb2340644c9e617c69f436fa5c
parent7207dd8f829baee58b4df6c97c19ffde77039e8d
Merge commit '7207dd8f829baee58b4df6c97c19ffde77039e8d'

* commit '7207dd8f829baee58b4df6c97c19ffde77039e8d':
  rmdec: check av_new_packet return value

Conflicts:
libavformat/rmdec.c

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