diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-03 12:22:41 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-03 12:22:41 +0200 |
| commit | 4d2160c99a00af98cb09749f24831580e816eda9 (patch) | |
| tree | cf897382bd18d139b6533f2fd889e25eee6eafbd /libavcodec/codec_desc.c | |
| parent | 9825a24e5b1c34663d672961ebd2561a009b23e9 (diff) | |
| parent | 9a3202a98b2e095b54dd784c3e01a09a676fc3fa (diff) | |
Merge commit '9a3202a98b2e095b54dd784c3e01a09a676fc3fa'
* commit '9a3202a98b2e095b54dd784c3e01a09a676fc3fa':
Screenpresso SPV1 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 b9c2f64688..da8d65816e 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1266,6 +1266,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("Resolume DXV"), .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, }, + { + .id = AV_CODEC_ID_SCREENPRESSO, + .type = AVMEDIA_TYPE_VIDEO, + .name = "screenpresso", + .long_name = NULL_IF_CONFIG_SMALL("Screenpresso"), + .props = AV_CODEC_PROP_LOSSLESS, + }, /* image codecs */ { |