ffmpeg/libavcodec
Michael Niedermayer e99f1a8cc8 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  dxva2: don't check for DXVA_PictureParameters->wDecodedPictureIndex
  img2: split muxer and demuxer into separate files
  rm: prevent infinite loops for index parsing.
  aac: fix infinite loop on end-of-frame with sequence of 1-bits.
  mov: Add more HDV and XDCAM FourCCs.
  lavf: don't set AVCodecContext.has_b_frames in compute_pkt_fields().
  rmdec: when using INT4 deinterleaving, error out if sub_packet_h <= 1.
  cdxl: correctly synchronize video timestamps to audio
  mlpdec_parser: fix a few channel layouts.
  Add channel names to channel_names[] array for channels added in b2890f5
  movenc: Buffer the mdat for the initial moov fragment, too
  flvdec: Ignore the index if the ignidx flag is set
  flvdec: Fix indentation
  movdec: Don't parse all fragments if ignidx is set
  movdec: Restart parsing root-level atoms at the right spot
  prores: use natural integer type for the codebook index
  mov: Add support for MPEG2 HDV 720p24 (hdv4)
  swscale: K&R formatting cosmetics (part I)
  swscale: variable declaration and placement cosmetics

Conflicts:
	configure
	libavcodec/aacdec.c
	libavcodec/mlp_parser.c
	libavformat/flvdec.c
	libavformat/img2.c
	libavformat/isom.h
	libavformat/mov.c
	libavformat/movenc.c
	libswscale/rgb2rgb.c
	libswscale/rgb2rgb_template.c
	libswscale/yuv2rgb.c

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