[FFmpeg-cvslog] Merge commit '85dc006b1a829726dd5e3a9b0fcc6a1dbfe6dffa'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov 18 03:16:38 2014 +0100| [cdbebae44440bea97f300f256d722c1495753bc2] | committer: Michael Niedermayer

Merge commit '85dc006b1a829726dd5e3a9b0fcc6a1dbfe6dffa'

* commit '85dc006b1a829726dd5e3a9b0fcc6a1dbfe6dffa':
  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=cdbebae44440bea97f300f256d722c1495753bc2
---