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)
commitd0cb6caf691ccd52fae1b3000691108cfacd327c
tree0d3dcf508732ff83e165aacb4be5224deeeb2ce5
parentc75fdee747179e21e3cc137b2565ba911b17f9c5
parent2b6ab3a2bd7e7cee5e7a55dd2e48b8feb4a826bb
Merge commit '2b6ab3a2bd7e7cee5e7a55dd2e48b8feb4a826bb'

* commit '2b6ab3a2bd7e7cee5e7a55dd2e48b8feb4a826bb':
  mpegvideo: Move QUANT_BIAS_SHIFT define to the only place it is used

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