Merge commit '0a6664706168dc1049967bec311970d720581625'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Nov 2014 16:21:11 +0000 (17:21 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Nov 2014 16:21:36 +0000 (17:21 +0100)
* commit '0a6664706168dc1049967bec311970d720581625':
  mpegvideo_enc: factor out denominator and explicitly cast operands

Conflicts:
libavcodec/mpegvideo_enc.c

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

Simple merge