[FFmpeg-cvslog] Merge commit 'f1ed83e23add1c26c50b146727e4c2399dfc0b3a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 25 03:37:21 2014 +0200| [d6095662706d3f0b334645eb7f92ed24a4d9e4ed] | committer: Michael Niedermayer

Merge commit 'f1ed83e23add1c26c50b146727e4c2399dfc0b3a'

* commit 'f1ed83e23add1c26c50b146727e4c2399dfc0b3a':
  img2dec: check av_new_packet return value

Conflicts:
	libavformat/img2dec.c

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

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