[FFmpeg-cvslog] Merge commit 'b7616f5716dce68c749d5dfeab19cf595a11807c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug  4 04:42:04 2014 +0200| [e9cd8f4d20cfe47bef5a2e95ace6b75a347eca68] | committer: Michael Niedermayer

Merge commit 'b7616f5716dce68c749d5dfeab19cf595a11807c'

* commit 'b7616f5716dce68c749d5dfeab19cf595a11807c':
  huffyuv: Eliminate some pointless casts

Conflicts:
	libavcodec/huffyuvdec.c

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

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