Merge commit '85dc006b1a829726dd5e3a9b0fcc6a1dbfe6dffa'

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

Conflicts:
	libavcodec/internal.h

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

diff --cc libavcodec/cavs.c
index 45d815a840526596ded0c36c52913945e0308e12,788fcada2188901e13974bc947d0d2be679c9d36..c0880e005f3ec6a0172c838f0aded4ab8a44118b
--- 1/libavcodec/cavs.c
--- 2/libavcodec/cavs.c
+++ b/libavcodec/cavs.c
@@@ -537,10 -528,10 +538,10 @@@ void ff_cavs_inter(AVSContext *h, enum 
  static inline void scale_mv(AVSContext *h, int *d_x, int *d_y,
                              cavs_vector *src, int distp)
  {
 -    int den = h->scale_den[src->ref];
 +    int den = h->scale_den[FFMAX(src->ref, 0)];
  
-     *d_x = (src->x * distp * den + 256 + (src->x >> 31)) >> 9;
-     *d_y = (src->y * distp * den + 256 + (src->y >> 31)) >> 9;
+     *d_x = (src->x * distp * den + 256 + FF_SIGNBIT(src->x)) >> 9;
+     *d_y = (src->y * distp * den + 256 + FF_SIGNBIT(src->y)) >> 9;
  }
  
  static inline void mv_pred_median(AVSContext *h,

diff --cc libavcodec/cavsdec.c
Simple merge

diff --cc libavcodec/dnxhdenc.c
Simple merge

diff --cc libavcodec/internal.h
index dcb2113f6fed81d63f9acee3340aac3c79618ed2,a68d6134e3d8d9331baa9a5831615db8a8fe3bc0..b8ceb2e9f1920883430a9675e375cafc739e54a4
--- 1/libavcodec/internal.h
--- 2/libavcodec/internal.h
+++ b/libavcodec/internal.h
@@@ -35,14 -35,8 +35,16 @@@
  
  #define FF_SANE_NB_CHANNELS 63U
  
+ #define FF_SIGNBIT(x) (x >> CHAR_BIT * sizeof(x) - 1)
+ 
 +#if HAVE_AVX
 +#   define STRIDE_ALIGN 32
 +#elif HAVE_SIMD_ALIGN_16
 +#   define STRIDE_ALIGN 16
 +#else
 +#   define STRIDE_ALIGN 8
 +#endif
 +
  typedef struct FramePool {
      /**
       * Pools for each data plane. For audio all the planes have the same size,

diff --cc libavcodec/vp8.c
Simple merge