[FFmpeg-cvslog] Merge commit '0a6664706168dc1049967bec311970d720581625'

Michael Niedermayer git at videolan.org
Thu Nov 6 17:27:54 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov  6 17:21:11 2014 +0100| [c96a44d0ddb063cf5c3d5b4fb2e46d3ca2309ba0] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c96a44d0ddb063cf5c3d5b4fb2e46d3ca2309ba0
---





More information about the ffmpeg-cvslog mailing list