diff options
| author | Clément Bœsch <u@pkh.me> | 2016-07-14 18:39:46 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2016-07-14 18:52:20 +0200 |
| commit | c3e2e842fa9141a4776238803100b63e14c79368 (patch) | |
| tree | e6ae22e1ebe334dfd514d67f80a00e5995863900 /libavcodec/codec_desc.c | |
| parent | a2c90d5f9828fed298a0b6ac87067a01216b0395 (diff) | |
| parent | d78fd2fa21cde28465e40dd0be4446b1387d22a6 (diff) | |
Merge commit 'd78fd2fa21cde28465e40dd0be4446b1387d22a6'
* commit 'd78fd2fa21cde28465e40dd0be4446b1387d22a6':
Add MagicYUV decoder
Changes observed from Libav:
- many cosmetics (function renames/move, spacing, line breaks)
- MagicYUVContext.slices_size is now unsigned
- use of pixdesc (include fixed in FFmpeg)
- mention of "Lossless" in the long name dropped (also removed from
general.texi in FFmpeg)
- addition of the FF_CODEC_CAP_INIT_THREADSAFE caps
- use of qsort() instead of AV_QSORT() (NOT MERGED)
- use of AVCodecContext.{width,height} instead of AVCodecContext.coded_{width,height} (NOT MERGED)
See also 77f9c4b7aa9eb793b3019025e177245896821816
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/codec_desc.c')
| -rw-r--r-- | libavcodec/codec_desc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 9d94b72ed2..da84d7d7b1 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1546,7 +1546,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .id = AV_CODEC_ID_MAGICYUV, .type = AVMEDIA_TYPE_VIDEO, .name = "magicyuv", - .long_name = NULL_IF_CONFIG_SMALL("MagicYUV Lossless Video"), + .long_name = NULL_IF_CONFIG_SMALL("MagicYUV video"), .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, }, { |