Merge commit '1232a1647ab27e024a3baf4d01d40c8d08d6ced9'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 17 May 2013 08:37:36 +0000 (10:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 17 May 2013 08:38:08 +0000 (10:38 +0200)
commit5bc892cb17225c8bfd54c12abf45012f393f03e3
tree9e1145ce0eaf8d5afb13e89ab6386ee9af7f330f
parentc453da33a3dee16724a734d08c0c7ba71c361b67
parent1232a1647ab27e024a3baf4d01d40c8d08d6ced9
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>
Changelog
configure
doc/general.texi
libavcodec/Makefile
libavcodec/aic.c
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/version.h
libavformat/isom.c