diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-19 14:06:39 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-19 14:36:11 +0400 |
| commit | b26ccf218d933660c551832b4b14976b2acb3f0c (patch) | |
| tree | 149a7c27caf046cc105156d9e481cd7af651a90c /libavcodec/utils.c | |
| parent | ac2fc63ac6f938a4c995d87486013baffb5ca18a (diff) | |
| parent | c4bfa098072ba338d83555d6e2199f7e1e64ffff (diff) | |
Merge commit 'c4bfa098072ba338d83555d6e2199f7e1e64ffff'
* commit 'c4bfa098072ba338d83555d6e2199f7e1e64ffff':
Add a WebP decoder
Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/avcodec.h
libavcodec/version.h
libavformat/img2.c
The previously existing webp decoder is disabled as the new
one supports lossless mode and alpha while the previous does not.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 92b6443d32..7ca2044a6c 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -2487,6 +2487,7 @@ static enum AVCodecID remap_deprecated_codec_id(enum AVCodecID id) case AV_CODEC_ID_TAK_DEPRECATED : return AV_CODEC_ID_TAK; case AV_CODEC_ID_ESCAPE130_DEPRECATED : return AV_CODEC_ID_ESCAPE130; case AV_CODEC_ID_G2M_DEPRECATED : return AV_CODEC_ID_G2M; + case AV_CODEC_ID_WEBP_DEPRECATED: return AV_CODEC_ID_WEBP; default : return id; } } |