]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b6d029c 4f97941)
Merge commit '4f979418c723652ad4e43115118c57a44bd46b52'
authorHendrik Leppkes <h.leppkes@gmail.com>
Mon, 7 Dec 2015 13:16:36 +0000 (14:16 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Mon, 7 Dec 2015 13:16:36 +0000 (14:16 +0100)
* commit '4f979418c723652ad4e43115118c57a44bd46b52':
  avfoundation: Simple capture

Not merged on request by Thilo Borgmann, original author of the
AVFoundation capture in FFmpeg.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

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