diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-23 22:47:13 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-23 22:47:13 +0400 |
| commit | 56efd98a6574641a32f08cd5123725cef28a309b (patch) | |
| tree | 27a85d0dc0eb40d0ad99e96bb7684514be3da44f /libavcodec/avcodec.h | |
| parent | ecb815e5117f3353ed3e67bb737029773d170212 (diff) | |
| parent | e2834567d73bd1e46478ba67ac133cb8ef5f50fd (diff) | |
Merge commit 'e2834567d73bd1e46478ba67ac133cb8ef5f50fd'
* commit 'e2834567d73bd1e46478ba67ac133cb8ef5f50fd':
On2 AVC decoder
Conflicts:
Changelog
configure
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/version.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 c41d156e37..9a14e6654a 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -484,6 +484,7 @@ enum AVCodecID { AV_CODEC_ID_TAK_DEPRECATED, AV_CODEC_ID_METASOUND, AV_CODEC_ID_PAF_AUDIO_DEPRECATED, + AV_CODEC_ID_ON2AVC, AV_CODEC_ID_FFWAVESYNTH = MKBETAG('F','F','W','S'), AV_CODEC_ID_SONIC = MKBETAG('S','O','N','C'), AV_CODEC_ID_SONIC_LS = MKBETAG('S','O','N','L'), |