[FFmpeg-cvslog] Merge commit '1232a1647ab27e024a3baf4d01d40c8d08d6ced9'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May 17 10:37:36 2013 +0200| [5bc892cb17225c8bfd54c12abf45012f393f03e3] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5bc892cb17225c8bfd54c12abf45012f393f03e3
---