[FFmpeg-cvslog] Merge remote-tracking branch 'cehoyos/master'

Michael Niedermayer git at videolan.org
Thu Jan 30 01:29:51 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 30 00:55:22 2014 +0100| [1a5e8511d4ed8778ada6db05d6f24c38a9e15825] | committer: Michael Niedermayer

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Force automatic thread_count to 1 for cbr mjpeg frame threading.

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

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





More information about the ffmpeg-cvslog mailing list