diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-04 03:41:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-04 03:41:49 +0100 |
| commit | f34cceb1fc58076ac69bef44bf07d8373e58f83d (patch) | |
| tree | 91c74321cfecee10af075f748264cffb5b3c5727 /libavdevice/v4l2.c | |
| parent | ec6d043f8e5842389b58e0a62cf952b14a5a16fc (diff) | |
| parent | 06fed44051d0258127f55afa4dd07dfbff021327 (diff) | |
| download | ffmpeg-f34cceb1fc58076ac69bef44bf07d8373e58f83d.tar.gz | |
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 'libavdevice/v4l2.c')
| -rw-r--r-- | libavdevice/v4l2.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index 96a272c192..c671e3ac73 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -1023,6 +1023,7 @@ static const AVClass v4l2_class = { .item_name = av_default_item_name, .option = options, .version = LIBAVUTIL_VERSION_INT, + .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT, }; AVInputFormat ff_v4l2_demuxer = { |