[FFmpeg-cvslog] Merge commit '4cd0041d38664adcb6f4b3038e277631b85d5dc8' into release/2.4

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 18 01:03:58 2015 +0100| [8120061be26980380c9e786c603ba6d3f4d1109f] | committer: Michael Niedermayer

Merge commit '4cd0041d38664adcb6f4b3038e277631b85d5dc8' into release/2.4

* commit '4cd0041d38664adcb6f4b3038e277631b85d5dc8':
  rmdec: check av_new_packet return value

Conflicts:
	libavformat/rmdec.c

See: c01a462cda8d7f298a3ac6d20752d23a11e43a8a
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8120061be26980380c9e786c603ba6d3f4d1109f
---