diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-26 14:39:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-26 14:39:25 +0100 |
| commit | fcb18ab8d03d6ff94fb9b1fd8a4289e53f59ab1a (patch) | |
| tree | 32c4de066555986f1d757fbefa5ca93154331e91 /COPYING.LGPLv3 | |
| parent | e44a4c1f5fcb2382dd7420c904590f4c8de7fec2 (diff) | |
| parent | 61974c7dcca833687d4f3834c7e8200a63a7b4af (diff) | |
| download | ffmpeg-fcb18ab8d03d6ff94fb9b1fd8a4289e53f59ab1a.tar.gz | |
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>
Diffstat (limited to 'COPYING.LGPLv3')
0 files changed, 0 insertions, 0 deletions