[FFmpeg-cvslog] Merge commit '4f979418c723652ad4e43115118c57a44bd46b52'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Mon Dec  7 14:16:36 2015 +0100| [14b583475607113a70796f5fa1477b880a950c8b] | committer: Hendrik Leppkes

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=14b583475607113a70796f5fa1477b880a950c8b
---