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 /libavformat/isom.c | |
| parent | c453da33a3dee16724a734d08c0c7ba71c361b67 (diff) | |
| parent | 1232a1647ab27e024a3baf4d01d40c8d08d6ced9 (diff) | |
| download | ffmpeg-5bc892cb17225c8bfd54c12abf45012f393f03e3.tar.gz | |
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 'libavformat/isom.c')
| -rw-r--r-- | libavformat/isom.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c index 44758468cb..079806ecb5 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -242,6 +242,8 @@ const AVCodecTag ff_codec_movvideo_tags[] = { { AV_CODEC_ID_PRORES, MKTAG('a', 'p', '4', 'h') }, /* Apple ProRes 4444 */ { AV_CODEC_ID_FLIC, MKTAG('f', 'l', 'i', 'c') }, + { AV_CODEC_ID_AIC, MKTAG('i', 'c', 'o', 'd') }, + { AV_CODEC_ID_NONE, 0 }, }; |