[FFmpeg-cvslog] Merge commit '0ef256d51518f0e483c38b9ee3b993cf0709d00e'

Michael Niedermayer git at videolan.org
Mon Jun 23 01:28:16 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 23 01:20:55 2014 +0200| [49f1b869b60f27ac450f3db301b46d56e5d5aca6] | committer: Michael Niedermayer

Merge commit '0ef256d51518f0e483c38b9ee3b993cf0709d00e'

* commit '0ef256d51518f0e483c38b9ee3b993cf0709d00e':
  libx264: Correctly manage constant rate factor params

Conflicts:
	libavcodec/libx264.c

See: 3a1c8951bc886e8af30e09dc0e20491f6f5c3937
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list