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)
commitc96a44d0ddb063cf5c3d5b4fb2e46d3ca2309ba0
tree89187f067277e30e8b87ab20dcbcc2b790edf1f7
parent5241f900581480030e2f2ac47010f86f7ee4f9fd
parent0a6664706168dc1049967bec311970d720581625
Merge commit '0a6664706168dc1049967bec311970d720581625'

* 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>
libavcodec/mpegvideo_enc.c