diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-17 10:37:36 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-17 10:38:08 +0200 |
commit | 5bc892cb17225c8bfd54c12abf45012f393f03e3 (patch) | |
tree | 9e1145ce0eaf8d5afb13e89ab6386ee9af7f330f /libavcodec/avcodec.h | |
parent | c453da33a3dee16724a734d08c0c7ba71c361b67 (diff) | |
parent | 1232a1647ab27e024a3baf4d01d40c8d08d6ced9 (diff) |
Merge commit '1232a1647ab27e024a3baf4d01d40c8d08d6ced9'
* commit '1232a1647ab27e024a3baf4d01d40c8d08d6ced9':
Apple Intermediate Codec decoder
movenc: Don't add base_data_offset in tfhd for PIFF files
Conflicts:
Changelog
libavcodec/allcodecs.c
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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 8f6a7228bc..efb030225a 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -269,6 +269,8 @@ enum AVCodecID { AV_CODEC_ID_CLLC, AV_CODEC_ID_MSS2, AV_CODEC_ID_VP9, + AV_CODEC_ID_AIC, + 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'), |