ffmpeg/libavcodec
Michael Niedermayer 464cef4c14 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  xwma: Validate channels and bits_per_coded_sample.
  mov: Do not read past the end of the ctts_data table.
  mov: Add missing terminator to mov_ch_layout_map_1ch.
  asf: reset side data elements on packet copy.
  wmavoice: fix stack overread.
  wmalossless: error out if a subframe is not used by any channel.
  vqa: check palette chunk size before reading data.
  wmalossless: reset sample pointer for each subframe.
  wmalossless: error out on invalid values for order.

Conflicts:
	libavcodec/vqavideo.c

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