[FFmpeg-cvslog] Merge commit 'd0393d79bc3d61c9f2ff832c0e273b7774ff0269'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug  4 05:08:01 2014 +0200| [2793b218bdd59db51f1f5c960c508fea7190310e] | committer: Michael Niedermayer

Merge commit 'd0393d79bc3d61c9f2ff832c0e273b7774ff0269'

* commit 'd0393d79bc3d61c9f2ff832c0e273b7774ff0269':
  huffyuv: Check and propagate function return values

Conflicts:
	libavcodec/huffyuvdec.c

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

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