diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-04 16:31:04 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-04 16:46:10 +0400 |
commit | fb61ed1e9fcac9163746ffe4a53c6aa2e284dde1 (patch) | |
tree | d7c9178f29036721f671350e81d6181db3380824 /libavcodec/avcodec.h | |
parent | 16509d3a286c55f9149c0a98e3d7200ed6d2ee16 (diff) | |
parent | ac4b32df71bd932838043a4838b86d11e169707f (diff) |
Merge commit 'ac4b32df71bd932838043a4838b86d11e169707f'
* commit 'ac4b32df71bd932838043a4838b86d11e169707f':
On2 VP7 decoder
Conflicts:
Changelog
libavcodec/arm/h264pred_init_arm.c
libavcodec/arm/vp8dsp.h
libavcodec/arm/vp8dsp_init_arm.c
libavcodec/arm/vp8dsp_init_armv6.c
libavcodec/arm/vp8dsp_init_neon.c
libavcodec/avcodec.h
libavcodec/h264pred.c
libavcodec/version.h
libavcodec/vp8.c
libavcodec/vp8.h
libavcodec/vp8data.h
libavcodec/vp8dsp.c
libavcodec/vp8dsp.h
libavcodec/x86/h264_intrapred_init.c
libavcodec/x86/vp8dsp_init.c
See: 89f2f5dbd7a23e7ec1073d3c08d46093a01a4135 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r-- | libavcodec/avcodec.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index a2891561b7..e9163a73d0 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -290,6 +290,7 @@ enum AVCodecID { AV_CODEC_ID_BRENDER_PIX_DEPRECATED, AV_CODEC_ID_PAF_VIDEO_DEPRECATED, AV_CODEC_ID_EXR_DEPRECATED, + AV_CODEC_ID_VP7_DEPRECATED, AV_CODEC_ID_BRENDER_PIX= MKBETAG('B','P','I','X'), AV_CODEC_ID_Y41P = MKBETAG('Y','4','1','P'), |