diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-09 09:55:14 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-09 09:55:14 +0200 |
| commit | b421455ee09982b403a2b3428d2b01c835663ed7 (patch) | |
| tree | d2e4fc601b469530246c8930be4fcb1086d78d93 /libavcodec/codec_desc.c | |
| parent | e407d70f8359f01d74d52f543a371a1ae2ebb778 (diff) | |
| parent | 3b8e895237592fdaffe87cdcd204104200b9ccf9 (diff) | |
| download | ffmpeg-b421455ee09982b403a2b3428d2b01c835663ed7.tar.gz | |
Merge commit '3b8e895237592fdaffe87cdcd204104200b9ccf9'
* commit '3b8e895237592fdaffe87cdcd204104200b9ccf9':
codec_desc: Add missing DXV entry
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 632748e4c1..e2f5176a03 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1259,6 +1259,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("Vidvox Hap decoder"), .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, }, + { + .id = AV_CODEC_ID_DXV, + .type = AVMEDIA_TYPE_VIDEO, + .name = "dxv", + .long_name = NULL_IF_CONFIG_SMALL("Resolume DXV"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, /* image codecs */ { |