[FFmpeg-cvslog] Merge commit '61fdbf7ff64c0ae1bdd6a8d573092dc6924c1dba' into release/2.4

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 18 02:34:25 2015 +0100| [4e251b23c31a81f7fda17f5468bcd8b70a757931] | committer: Michael Niedermayer

Merge commit '61fdbf7ff64c0ae1bdd6a8d573092dc6924c1dba' into release/2.4

* commit '61fdbf7ff64c0ae1bdd6a8d573092dc6924c1dba':
  lavc: fix bitshifts amount bigger than the type

Conflicts:
	libavcodec/internal.h

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

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