]> git.sesse.net Git - ffmpeg/commit
projects / ffmpeg / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit14b583475607113a70796f5fa1477b880a950c8b
treeeb58331ba76e175673caff8d4027821b73551ed1tree | snapshot
parentb6d029c2efea43173c2e53053c1ba89907af9dfdcommit | diff
parent4f979418c723652ad4e43115118c57a44bd46b52commit | diff
Merge commit '4f979418c723652ad4e43115118c57a44bd46b52'

* 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>
Unnamed repository; edit this file 'description' to name the repository.