Files
FFmpeg/libavcodec
Michael Niedermayer 55aedd679a Merge commit 'ce1dacb435460dda1f9d453eaaeac44bd502aca4' into release/1.1
* commit 'ce1dacb435460dda1f9d453eaaeac44bd502aca4':
  rl2: Avoid a division by zero
  wtv: Add more sanity checks for a length read from the file
  segafilm: Validate the number of audio channels
  qpeg: Add checks for running out of rows in qpeg_decode_inter
  mpegaudiodec: Validate that the number of channels fits at the given offset
  asvdec: Verify the amount of extradata
  idroqdec: Make sure a video stream has been allocated before returning packets
  rv10: Validate the dimensions set from the container
  xmv: Add more sanity checks for parameters read from the bitstream
  ffv1: Make sure at least one slice context is initialized
  truemotion2: Use av_freep properly in an error path
  eacmv: Make sure a reference frame exists before referencing it
  mpeg4videodec: Check the width/height in mpeg4_decode_sprite_trajectory
  ivi_common: Make sure color planes have been initialized
  mov: Don't use a negative duration for setting other fields

Conflicts:
	libavcodec/eacmv.c
	libavcodec/ffv1.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegaudiodec.c
	libavcodec/qpeg.c
	libavformat/mov.c
	libavformat/wtv.c
	libavformat/xmv.c

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