diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-03 12:42:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-03 12:47:26 +0200 |
| commit | e5cdf9c03b1ef0913dad117b0e5d343a525f6d10 (patch) | |
| tree | 82a2beb4104fa6f9c5d8d6a862b4165be227072c /libavcodec/avcodec.h | |
| parent | 5c43f3ddea40fc76264d647750f6986a9247aead (diff) | |
| parent | 2d66a58ccde05e764594bd7e5f0f9244634d0b2c (diff) | |
Merge commit '2d66a58ccde05e764594bd7e5f0f9244634d0b2c'
* commit '2d66a58ccde05e764594bd7e5f0f9244634d0b2c':
Go2Webinar decoder
Conflicts:
Changelog
configure
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/version.h
libavformat/riff.c
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 dbcfb780d0..455f57bb3b 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -272,6 +272,7 @@ enum AVCodecID { AV_CODEC_ID_VP9, AV_CODEC_ID_AIC, AV_CODEC_ID_ESCAPE130_DEPRECATED, + AV_CODEC_ID_G2M_DEPRECATED, AV_CODEC_ID_BRENDER_PIX= MKBETAG('B','P','I','X'), AV_CODEC_ID_Y41P = MKBETAG('Y','4','1','P'), |