]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e44a4c1 61974c7)
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)
* 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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.