Merge commit '61fdbf7ff64c0ae1bdd6a8d573092dc6924c1dba' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 01:34:25 +0000 (02:34 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 01:34:25 +0000 (02:34 +0100)
commit4e251b23c31a81f7fda17f5468bcd8b70a757931
tree7ffefb65f3dbc070e856a8ae6d96ddf29690b1a1
parent9b669f9b14134c5d3e9f03ae987ade15689bd14c
parent61fdbf7ff64c0ae1bdd6a8d573092dc6924c1dba
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@gmx.at>
libavcodec/cavs.c
libavcodec/cavsdec.c
libavcodec/dnxhdenc.c
libavcodec/internal.h
libavcodec/vp8.c