[FFmpeg-cvslog] Merge remote-tracking branch 'rdp/dshow_tv_tuner'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 26 14:39:22 2015 +0100| [fcb18ab8d03d6ff94fb9b1fd8a4289e53f59ab1a] | committer: Michael Niedermayer

Merge remote-tracking branch 'rdp/dshow_tv_tuner'

* rdp/dshow_tv_tuner:
  dshow: tweak logging
  dshow: crossbar dialog was frequently being displayed twice, split up option so it can be just once
  dshow: alert as to ramifications of switching crossbar routing
  dshow: add properties dialog for tv tuners

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

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