diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-27 13:58:44 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-27 13:58:44 +0100 |
| commit | 8b3228a329bb38671aee9c4434f2989d149732fe (patch) | |
| tree | e6e60e471a3ff518e7b3d71f63197d44349ce768 /libavcodec/codec_desc.c | |
| parent | 8dde5dc05ae2fc4d4a5adc0a718631673b2af0f7 (diff) | |
| parent | 533a6198505edd1379e1cd722852350ae4a85acc (diff) | |
Merge commit '533a6198505edd1379e1cd722852350ae4a85acc'
* commit '533a6198505edd1379e1cd722852350ae4a85acc':
innoHeim/Rsupport Screen Capture Codec decoder
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/codec_desc.c')
| -rw-r--r-- | libavcodec/codec_desc.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 32f1f8aa44..ac64a4bb21 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1280,6 +1280,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("AVFrame to AVPacket passthrough"), .props = AV_CODEC_PROP_LOSSLESS, }, + { + .id = AV_CODEC_ID_RSCC, + .type = AVMEDIA_TYPE_VIDEO, + .name = "rscc", + .long_name = NULL_IF_CONFIG_SMALL("innoHeim/Rsupport Screen Capture Codec"), + .props = AV_CODEC_PROP_LOSSLESS, + }, /* image codecs */ { |