* commit '85dc006b':
  lavc: fix bitshifts amount bigger than the type

Conflicts:
	libavcodec/internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>