diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-19 21:47:18 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-19 21:47:58 +0400 |
| commit | 0c67ef272943c10decb9243c95fc209a7d3f2e12 (patch) | |
| tree | 2f31da67db1e439077fbef36257ff3a2d71d37e9 /libavcodec/avcodec.h | |
| parent | e37dbfddda0380fd9ea9ba1bbae8a5ab2afc6573 (diff) | |
| parent | 86a0432688216562926d4aee36118f01be6d5e1b (diff) | |
Merge commit '86a0432688216562926d4aee36118f01be6d5e1b'
* commit '86a0432688216562926d4aee36118f01be6d5e1b':
Silicon Graphics Motion Video Compressor 1 & 2 decoder
Conflicts:
Changelog
libavcodec/avcodec.h
libavcodec/mvcdec.c
libavcodec/version.h
See: 746b1dcc98b466e4abd301f304127583722ad80b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 701941c988..b02dadfcaf 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -293,6 +293,8 @@ enum AVCodecID { AV_CODEC_ID_VP7_DEPRECATED, AV_CODEC_ID_SANM_DEPRECATED, AV_CODEC_ID_SGIRLE_DEPRECATED, + AV_CODEC_ID_MVC1_DEPRECATED, + AV_CODEC_ID_MVC2_DEPRECATED, AV_CODEC_ID_BRENDER_PIX= MKBETAG('B','P','I','X'), AV_CODEC_ID_Y41P = MKBETAG('Y','4','1','P'), |