Merge commit '85dc006b1a829726dd5e3a9b0fcc6a1dbfe6dffa'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 18 Nov 2014 02:16:38 +0000 (03:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 18 Nov 2014 02:16:38 +0000 (03:16 +0100)
commitcdbebae44440bea97f300f256d722c1495753bc2
treeb9fc7a0e480d3c10bd950cd8495b48982f78de78
parent8426edef4cf521104bb9288ac46a48dc4bdaee53
parent85dc006b1a829726dd5e3a9b0fcc6a1dbfe6dffa
Merge commit '85dc006b1a829726dd5e3a9b0fcc6a1dbfe6dffa'

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

Conflicts:
libavcodec/internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/cavs.c
libavcodec/cavsdec.c
libavcodec/dnxhdenc.c
libavcodec/internal.h
libavcodec/vp8.c