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/codec_desc.c | |
parent | c453da33a3dee16724a734d08c0c7ba71c361b67 (diff) | |
parent | 1232a1647ab27e024a3baf4d01d40c8d08d6ced9 (diff) | |
download | android_external_ffmpeg-5bc892cb17225c8bfd54c12abf45012f393f03e3.tar.gz android_external_ffmpeg-5bc892cb17225c8bfd54c12abf45012f393f03e3.tar.bz2 android_external_ffmpeg-5bc892cb17225c8bfd54c12abf45012f393f03e3.zip |
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/codec_desc.c')
-rw-r--r-- | libavcodec/codec_desc.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index b4fdd9422f..72071b943e 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1248,6 +1248,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, }, { + .id = AV_CODEC_ID_AIC, + .type = AVMEDIA_TYPE_VIDEO, + .name = "aic", + .long_name = NULL_IF_CONFIG_SMALL("Apple Intermediate Codec"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, + { .id = AV_CODEC_ID_Y41P, .type = AVMEDIA_TYPE_VIDEO, .name = "y41p", |