[FFmpeg-cvslog] Merge commit '4a6622550a4a4bf4690ea7d9fe42210a30a67936' into release/0.10

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Sat Aug  9 19:58:37 2014 +0200| [7d42ede8fec4e074e4352ddee8238bd46317e12e] | committer: Michael Niedermayer

Merge commit '4a6622550a4a4bf4690ea7d9fe42210a30a67936' into release/0.10

* commit '4a6622550a4a4bf4690ea7d9fe42210a30a67936':
  huffyuv: Check and propagate function return values

Conflicts:
	libavcodec/huffyuv.c

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

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