diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-19 21:12:57 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-19 21:26:46 +0400 |
| commit | e37dbfddda0380fd9ea9ba1bbae8a5ab2afc6573 (patch) | |
| tree | 6d466e4b5f4f4e661031f14453a62ab2b86d0776 /libavcodec/utils.c | |
| parent | 928b5708f94c50e8cb0b982208a2d097b0d588c2 (diff) | |
| parent | 07761294fc3f08e139e8a406ef7d5b63aaf1ecee (diff) | |
Merge commit '07761294fc3f08e139e8a406ef7d5b63aaf1ecee'
* commit '07761294fc3f08e139e8a406ef7d5b63aaf1ecee':
Silicon Graphics RLE 8-bit video decoder
Conflicts:
Changelog
doc/general.texi
libavcodec/avcodec.h
libavcodec/sgirledec.c
libavcodec/version.h
See: afa1617b937f3675f74c6351a46c45f8c24d67f2
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 ad1aae677a..00efa12d99 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -2690,6 +2690,7 @@ static enum AVCodecID remap_deprecated_codec_id(enum AVCodecID id) case AV_CODEC_ID_WEBP_DEPRECATED : return AV_CODEC_ID_WEBP; case AV_CODEC_ID_HEVC_DEPRECATED : return AV_CODEC_ID_HEVC; case AV_CODEC_ID_SANM_DEPRECATED : return AV_CODEC_ID_SANM; + case AV_CODEC_ID_SGIRLE_DEPRECATED : return AV_CODEC_ID_SGIRLE; case AV_CODEC_ID_VP7_DEPRECATED : return AV_CODEC_ID_VP7; default : return id; } |