aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/on2avcdata.h
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2015-12-07 14:16:36 +0100
committerHendrik Leppkes <h.leppkes@gmail.com>2015-12-07 14:16:36 +0100
commit14b583475607113a70796f5fa1477b880a950c8b (patch)
treeeb58331ba76e175673caff8d4027821b73551ed1 /libavcodec/on2avcdata.h
parentb6d029c2efea43173c2e53053c1ba89907af9dfd (diff)
parent4f979418c723652ad4e43115118c57a44bd46b52 (diff)
downloadffmpeg-14b583475607113a70796f5fa1477b880a950c8b.tar.gz
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>
Diffstat (limited to 'libavcodec/on2avcdata.h')
0 files changed, 0 insertions, 0 deletions