diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-08 19:02:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-08 19:02:46 +0100 |
| commit | 0c4bf87b296145e38510655d1a14196493d5c54e (patch) | |
| tree | 63eb4722659980ba21abe4b72ab8a2f0e48f8a57 /libavcodec/codec_desc.c | |
| parent | b08f554fdc0886ab9815b2e3db3ae8a93baa57c8 (diff) | |
| parent | cde7df25ef74b85b5ce11d9171779f28f0c12d15 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Mirillis FIC video decoder
Conflicts:
Changelog
configure
libavcodec/Makefile
libavcodec/avcodec.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 1639046570..a217d3567c 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1403,6 +1403,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("H.265 / HEVC (High Efficiency Video Coding)"), .props = AV_CODEC_PROP_LOSSY, }, + { + .id = AV_CODEC_ID_FIC, + .type = AVMEDIA_TYPE_VIDEO, + .name = "fic", + .long_name = NULL_IF_CONFIG_SMALL("Mirillis FIC"), + .props = AV_CODEC_PROP_LOSSY, + }, /* various PCM "codecs" */ { |