summaryrefslogtreecommitdiff
path: root/libavfilter
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-04 03:41:45 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-04 03:41:49 +0100
commitf34cceb1fc58076ac69bef44bf07d8373e58f83d (patch)
tree91c74321cfecee10af075f748264cffb5b3c5727 /libavfilter
parentec6d043f8e5842389b58e0a62cf952b14a5a16fc (diff)
parent06fed44051d0258127f55afa4dd07dfbff021327 (diff)
Merge remote-tracking branch 'lukaszmluki/master'
* lukaszmluki/master: lavd/avdevice: add device iterators lavd: add categories to device implementations lavu/log: add device categories Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
0 files changed, 0 insertions, 0 deletions