Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Oct 2014 01:01:10 +0000 (02:01 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Oct 2014 01:54:46 +0000 (02:54 +0100)
commit5b864470808a352ff7ccfbe44eae3eeae2cccd6e
treedad323850dd8c035d738d5bf22d7ffcdcd02c608
parentf3c0e0bf6f53df0977f3878d4f5cec99dff8de9e
parent238ed47faeadf4ed0008da774cf61d6b224e4254
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@gmx.at>