diff options
| author | Michael Niedermayer <[email protected]> | 2014-03-04 03:41:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-03-04 03:41:49 +0100 |
| commit | f34cceb1fc58076ac69bef44bf07d8373e58f83d (patch) | |
| tree | 91c74321cfecee10af075f748264cffb5b3c5727 /libavutil/log.c | |
| parent | ec6d043f8e5842389b58e0a62cf952b14a5a16fc (diff) | |
| parent | 06fed44051d0258127f55afa4dd07dfbff021327 (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 <[email protected]>
Diffstat (limited to 'libavutil/log.c')
| -rw-r--r-- | libavutil/log.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/libavutil/log.c b/libavutil/log.c index 38ce1e8fc8..a0bb5e468b 100644 --- a/libavutil/log.c +++ b/libavutil/log.c @@ -71,6 +71,12 @@ static const uint8_t color[16 + AV_CLASS_CATEGORY_NB] = { [16+AV_CLASS_CATEGORY_BITSTREAM_FILTER] = 9, [16+AV_CLASS_CATEGORY_SWSCALER ] = 7, [16+AV_CLASS_CATEGORY_SWRESAMPLER ] = 7, + [16+AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT ] = 13, + [16+AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT ] = 5, + [16+AV_CLASS_CATEGORY_DEVICE_AUDIO_OUTPUT ] = 13, + [16+AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT ] = 5, + [16+AV_CLASS_CATEGORY_DEVICE_OUTPUT ] = 13, + [16+AV_CLASS_CATEGORY_DEVICE_INPUT ] = 5, }; static int16_t background, attr_orig; @@ -96,6 +102,12 @@ static const uint32_t color[16 + AV_CLASS_CATEGORY_NB] = { [16+AV_CLASS_CATEGORY_BITSTREAM_FILTER] = 192 << 8 | 0x14, [16+AV_CLASS_CATEGORY_SWSCALER ] = 153 << 8 | 0x14, [16+AV_CLASS_CATEGORY_SWRESAMPLER ] = 147 << 8 | 0x14, + [16+AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT ] = 213 << 8 | 0x15, + [16+AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT ] = 207 << 8 | 0x05, + [16+AV_CLASS_CATEGORY_DEVICE_AUDIO_OUTPUT ] = 213 << 8 | 0x15, + [16+AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT ] = 207 << 8 | 0x05, + [16+AV_CLASS_CATEGORY_DEVICE_OUTPUT ] = 213 << 8 | 0x15, + [16+AV_CLASS_CATEGORY_DEVICE_INPUT ] = 207 << 8 | 0x05, }; #endif |