Merge remote-tracking branch 'rdp/dshow_tv_tuner'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 26 Jan 2015 13:39:22 +0000 (14:39 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 26 Jan 2015 13:39:25 +0000 (14:39 +0100)
commitfcb18ab8d03d6ff94fb9b1fd8a4289e53f59ab1a
tree32c4de066555986f1d757fbefa5ca93154331e91
parente44a4c1f5fcb2382dd7420c904590f4c8de7fec2
parent61974c7dcca833687d4f3834c7e8200a63a7b4af
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@gmx.at>