diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-15 17:57:57 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-15 17:57:57 +0400 |
commit | 353dbaa29714c9fb7d4b3ccc7e1b50569b0ea257 (patch) | |
tree | e0e67a898b5e6ce2ba9d641473960beb109995ff /libavcodec/avcodec.h | |
parent | 8686b6c68bacfdd9ffa89736756192188973ad5d (diff) | |
parent | 3f111804eb5c603a344706b84b7164cbf7b4e0df (diff) |
Merge commit '3f111804eb5c603a344706b84b7164cbf7b4e0df'
* commit '3f111804eb5c603a344706b84b7164cbf7b4e0df':
libvpx: make vp8 and vp9 selectable
libvpx: support vp9
nut: support vp9 tag
mkv: support vp9 tag
rtpdec: Make variables that should wrap unsigned
Conflicts:
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
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 1522c95382..9367093265 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -267,6 +267,7 @@ enum AVCodecID { AV_CODEC_ID_MTS2, AV_CODEC_ID_CLLC, AV_CODEC_ID_MSS2, + AV_CODEC_ID_VP9, AV_CODEC_ID_BRENDER_PIX= MKBETAG('B','P','I','X'), AV_CODEC_ID_Y41P = MKBETAG('Y','4','1','P'), AV_CODEC_ID_ESCAPE130 = MKBETAG('E','1','3','0'), |