Merge commit '1232a164'
* commit '1232a164': 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: NMichael Niedermayer <michaelni@gmx.at>
Showing
libavcodec/aic.c
0 → 100644
想要评论请 注册 或 登录