git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9f08871
15b02dd
)
Merge remote-tracking branch 'lippit/master'
author
Michael Niedermayer
<michaelni@gmx.at>
Wed, 14 Nov 2012 01:24:11 +0000
(
02:24
+0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Wed, 14 Nov 2012 01:24:17 +0000
(
02:24
+0100)
* lippit/master:
Update iec61883 to handle multiple devices, and allow selection of DV device by its GUID
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge