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

Michael Niedermayer git at videolan.org
Wed Oct 29 02:55:43 CET 2014

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 29 02:01:10 2014 +0100| [5b864470808a352ff7ccfbe44eae3eeae2cccd6e] | committer: Michael Niedermayer

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Mention in the documentation that fieldmatch needs cfr input.
  Use v4l2 input format automatically if filename starts with "/dev/video"
  Print a warning if a subtitle demuxer changes utf16 to utf8.
  Do not set the lame quality if the user didn't request it.

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

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

More information about the ffmpeg-cvslog mailing list