]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9f08871 15b02dd)
Merge remote-tracking branch 'lippit/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 14 Nov 2012 01:24:11 +0000 (02:24 +0100)
committerMichael 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
Unnamed repository; edit this file 'description' to name the repository.