diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-05-05 18:09:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-05-06 15:36:24 +0200 |
| commit | 4155d5e06fa783e057cb6dc36124fafedbe19ca3 (patch) | |
| tree | 0cef2df63f3128799d2afb181a0c0281047ba310 /libavcodec/codec_desc.c | |
| parent | 31ce01bdb9722a552d5b316d97aa6e294de0c7cc (diff) | |
avcodec: add M101 decoder
Fixes Ticket 2611
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
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 7b48ee61c7..c582b490c0 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -948,6 +948,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, }, { + .id = AV_CODEC_ID_M101, + .type = AVMEDIA_TYPE_VIDEO, + .name = "m101", + .long_name = NULL_IF_CONFIG_SMALL("Matrox Uncompressed SD"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + }, + { .id = AV_CODEC_ID_MVC1, .type = AVMEDIA_TYPE_VIDEO, .name = "mvc1", |