diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 16:14:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 17:13:00 +0100 |
| commit | 5eb1704d5f5a85ff5b532887d559f3cf2822d8fc (patch) | |
| tree | 9282c0edf8e3dd4b4dd014f157044c34dc6527cb /libavcodec/utils.c | |
| parent | c617c669e9fce59905915c3ba1053f535add6a06 (diff) | |
| parent | 064698d381e1e7790f21b0199a8930ea04e2e942 (diff) | |
| download | ffmpeg-5eb1704d5f5a85ff5b532887d559f3cf2822d8fc.tar.gz | |
Merge commit '064698d381e1e7790f21b0199a8930ea04e2e942'
* commit '064698d381e1e7790f21b0199a8930ea04e2e942':
Add HEVC decoder
Conflicts:
Changelog
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/hevc.c
libavcodec/hevc.h
libavcodec/hevc_cabac.c
libavcodec/hevc_filter.c
libavcodec/hevc_mvs.c
libavcodec/hevc_parser.c
libavcodec/hevc_ps.c
libavcodec/hevc_refs.c
libavcodec/hevc_sei.c
libavcodec/hevcdsp.c
libavcodec/hevcdsp_template.c
libavcodec/hevcpred.c
libavcodec/hevcpred_template.c
libavcodec/version.h
cosmetics from hevc.h & hevc_ps.c mostly merged, other files left as they where in ffmpeg.
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 376fa6d8b1..2ab8e70265 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -2606,6 +2606,7 @@ static enum AVCodecID remap_deprecated_codec_id(enum AVCodecID id) 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; + case AV_CODEC_ID_HEVC_DEPRECATED: return AV_CODEC_ID_HEVC; default : return id; } } |