Merge commit '2b6ab3a2bd7e7cee5e7a55dd2e48b8feb4a826bb'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Jul 2014 12:15:20 +0000 (14:15 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Jul 2014 12:15:48 +0000 (14:15 +0200)
* commit '2b6ab3a2bd7e7cee5e7a55dd2e48b8feb4a826bb':
  mpegvideo: Move QUANT_BIAS_SHIFT define to the only place it is used

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c

Simple merge
  #include "internal.h"
  #include "bytestream.h"
  #include <limits.h>
 +#include "sp5x.h"
  
+ #define QUANT_BIAS_SHIFT 8
  static int encode_picture(MpegEncContext *s, int picture_number);
  static int dct_quantize_refine(MpegEncContext *s, int16_t *block, int16_t *weight, int16_t *orig, int n, int qscale);
  static int sse_mb(MpegEncContext *s);