1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-08 22:39:44 +02:00
FFmpeg/libavcodec
Michael Niedermayer 5bc892cb17 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>
2013-05-17 10:38:08 +02:00
..
2013-05-10 16:53:50 -03:00
2013-05-10 16:10:51 -03:00
2013-05-13 14:39:32 +02:00
2013-05-04 14:42:19 +02:00
2013-05-15 12:15:21 +02:00
2013-05-07 20:33:46 +02:00
2013-05-04 02:50:30 +02:00
2013-05-11 21:23:46 +02:00
2013-05-16 14:05:46 +02:00
2013-05-06 01:58:10 +02:00
2013-05-06 16:38:03 +02:00
2013-05-10 01:40:24 +02:00
2013-05-07 21:59:05 +02:00
2013-05-07 20:05:53 +02:00
2013-05-05 15:12:59 +02:00