FFmpeg/libavcodec
Michael Niedermayer feb997577b Merge remote-tracking branch 'qatar/master'
* qatar/master: (25 commits)
  riff: fix invalid av_freep() calls on EOF in ff_read_riff_info
  pam: Fix a typo that broke writing and reading PAM files.
  mxfdec: fix memleak on av_realloc failures
  mxfdec: Do not parse slices or DeltaEntryArrays.
  mxfdec: hybrid demuxing/seeking solution
  mxfdec: Add Avid's essence element key.
  mfxdec: Separate mxf_essence_container_uls for audio and video.
  mxfdec: Compute packet offsets properly.
  mxfdec: Use MaterialPackage - Track - TrackID instead of the system_item hack.
  mxfdec: use av_dlog() for 'no corresponding source package found'
  mxfdec: Make mxf->partitions sorted by offset.
  mxfdec: parse ThisPartition
  mxfdec: Speed up metadata and index parsing.
  mxfdec: Make sure DataDefinition is consistent between material track and source track.
  mxfdec: add EssenceContainer UL found in 0001GL00.MXF.A1.mxf_opatom.mxf
  mxfdec: Add hack that adjusts the n_delta calculation when system items are present.
  mxfdec: Parse IndexTableSegments and convert them into AVIndexEntry arrays.
  mxfdec: Move FooterPartition to MXFContext and make sure it is never zero.
  mxfdec: check return value of avio_seek
  mxfdec: skip to end of structural sets
  ...

Conflicts:
	configure
	libavcodec/pnm.c
	libavformat/mxfdec.c
	libavformat/riff.c
	libavformat/rtsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-23 01:05:20 +01:00
..
2012-01-17 08:41:39 +01:00
2011-11-27 21:19:07 +01:00
2011-11-25 13:19:54 +00:00
2012-01-03 16:28:17 -05:00
2012-01-14 01:17:06 +01:00
2012-01-17 20:16:35 +01:00
2012-01-17 20:16:35 +01:00
2012-01-14 17:23:57 +01:00
2012-01-12 16:32:55 +01:00
2012-01-11 21:29:25 +01:00
2011-11-12 20:01:05 +01:00
2012-01-14 04:47:27 +01:00
2011-11-12 20:01:50 +01:00
2011-12-28 22:05:24 +01:00
2011-11-12 20:05:35 +01:00
2011-10-30 21:50:17 +01:00
2011-10-30 21:50:17 +01:00
2011-12-30 20:00:53 +01:00
2011-11-05 00:02:31 +01:00
2012-01-19 17:12:43 +01:00
2012-01-14 01:15:42 +01:00
2011-12-11 00:32:25 +01:00
2011-11-05 00:02:38 +01:00
2011-11-12 20:07:31 +01:00
2011-12-10 11:58:03 +01:00
2011-12-19 16:30:30 +01:00
2012-01-17 20:16:35 +01:00
2012-01-22 14:41:15 +01:00
2011-11-09 23:10:07 +01:00
2011-12-30 20:00:53 +01:00
2012-01-11 08:56:24 -05:00
2012-01-11 08:56:24 -05:00
2011-11-05 15:37:02 +01:00
2011-11-05 15:37:02 +01:00
2011-12-23 05:58:32 +01:00
2011-10-21 01:00:41 -07:00
2011-10-21 01:00:41 -07:00
2012-01-15 14:13:25 +01:00
2012-01-12 16:32:55 +01:00
2011-11-13 15:43:09 +01:00
2011-11-24 15:39:41 +01:00
2012-01-07 00:11:43 +01:00
2012-01-17 20:16:35 +01:00
2012-01-12 16:32:55 +01:00
2011-12-17 05:04:56 +01:00
2011-12-13 15:46:23 +01:00
2011-11-11 18:40:19 +01:00
2012-01-19 23:31:21 +01:00
2012-01-17 20:55:19 +01:00
2011-12-30 20:00:53 +01:00
2011-11-12 20:15:21 +01:00
2012-01-12 17:02:13 +01:00
2011-10-27 15:27:32 +02:00
2011-11-12 20:15:56 +01:00
2011-12-13 21:08:43 +01:00
2012-01-16 19:26:41 +01:00
2012-01-16 19:26:41 +01:00
2011-12-30 20:00:53 +01:00
2011-12-23 11:39:41 +01:00
2012-01-22 04:49:46 +01:00
2012-01-14 01:10:13 +01:00
2012-01-11 18:14:13 +01:00
2012-01-14 22:58:19 +01:00
2011-12-13 19:54:31 +01:00
2011-10-19 20:26:55 +02:00
2011-12-01 18:46:22 +01:00
2012-01-08 20:22:12 +01:00
2012-01-08 20:22:12 +01:00
2012-01-08 20:22:12 +01:00
2012-01-16 19:21:24 +01:00
2011-11-12 20:49:53 +01:00