1
0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-10-28 15:19:38 +03:00
Files
ffmpeg/libavformat
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-11-27 10:17:28 +00:00
2012-12-16 10:41:00 +00:00
2013-01-03 19:35:02 +00:00
2013-01-06 13:58:15 +11:00
2012-12-30 23:37:14 +01:00
…
2012-11-03 05:35:35 +01:00
2012-09-28 02:40:53 +02:00
2012-11-11 22:58:56 +01:00
2012-12-04 11:25:46 +00:00
2012-12-04 11:25:46 +00:00
2012-12-04 11:25:46 +00:00
2013-01-04 19:52:57 +00:00
…
…
2012-12-21 00:18:34 +01:00
…
2012-12-05 12:40:57 +00:00
2012-12-16 16:53:01 +01:00
2012-10-26 15:34:25 +00:00
2012-11-12 10:33:18 -05:00
2012-11-24 15:04:32 +00:00
2012-10-18 00:55:03 +02:00
2012-11-19 10:19:50 +01:00
…
2012-12-12 01:22:09 +01:00
2012-12-05 20:44:28 +00:00
2012-11-21 16:39:44 +00:00
…
…
2013-01-01 19:29:04 +01:00
2012-10-10 15:50:32 +00:00
…
2012-12-05 20:18:04 +00:00
2012-12-05 13:01:22 +00:00
2012-11-08 15:54:14 +01:00
…
2012-11-27 13:24:00 +01:00
…
2012-12-04 15:21:24 +00:00
…
…
2013-03-07 14:56:57 +01:00
2012-12-21 00:18:34 +01:00
2012-12-11 00:03:23 +01:00
2012-12-21 00:18:34 +01:00
…
2012-12-21 22:56:13 +01:00
2013-01-03 21:48:38 +01:00
2012-12-05 13:01:22 +00:00
2012-12-05 13:01:22 +00:00
2013-01-03 21:48:38 +01:00
2013-01-01 16:20:10 +01:00
2013-02-25 05:52:16 -03:00
…
2012-10-25 20:57:40 +00:00
2013-02-22 22:53:11 +01:00
…
…
…
2013-08-20 18:45:17 +02:00
2013-09-10 21:44:39 +02:00
…
2013-01-04 20:58:59 +01:00
2012-12-30 23:09:49 +01:00
2013-01-18 05:14:31 +01:00
2012-12-01 09:06:24 +00:00
2012-12-29 18:56:33 +01:00
2012-12-23 21:22:43 +00:00
2012-12-18 14:03:04 +01:00
2012-11-05 00:28:21 +01:00
2013-03-31 18:07:31 +02:00
2012-11-24 10:04:20 +00:00
2012-11-21 15:34:45 +00:00
…
2012-12-04 15:52:58 +00:00
…
2012-12-23 16:08:10 +01:00
2012-11-21 09:48:46 +00:00
…
2012-08-28 22:29:20 +02:00
…
2012-12-17 01:53:35 +01:00
…
…
2012-12-17 13:34:30 +01:00
2012-11-17 19:58:54 +00:00
…
2012-12-28 21:50:42 +00:00
2012-12-28 21:58:03 +00:00
…
2013-01-06 18:48:51 +01:00
2013-01-06 18:48:51 +01:00
2013-01-03 07:25:47 +01:00
2012-12-09 22:01:00 +00:00
2012-12-16 10:27:54 +00:00
2012-10-15 08:12:25 +00:00
2012-08-29 00:05:03 +02:00
2013-01-06 18:48:51 +01:00
2012-11-04 04:46:10 +00:00
2012-12-31 07:10:57 +00:00
2012-11-06 15:52:33 +01:00
2012-11-24 10:20:46 +00:00
2012-12-21 21:18:12 +01:00
2012-12-23 01:01:17 +01:00