Files
ffmpeg/libavcodec
Michael Niedermayer ad60b3b181 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  vorbis: Validate that the floor 1 X values contain no duplicates.
  avprobe: Identify codec probe failures rather than calling them unsupported codecs.
  avformat: Probe codecs at score 0 on buffer exhaustion conditions.
  avformat: Factorize codec probing.
  Indeo Audio decoder
  imc: make IMDCT support stereo output
  imc: move channel-specific data into separate context
  lavfi: remove request/poll and drawing functions from public API on next bump
  lavfi: make avfilter_insert_pad and pals private on next bump.
  lavfi: make formats API private on next bump.
  avplay: use buffersrc instead of custom input filter.
  avtools: move buffer management code from avconv to cmdutils.
  avconv: don't use InputStream in the buffer management code.
  avconv: fix exiting when max frames is reached.
  mpc8: fix maximum bands handling
  aacdec: Turn PS off when switching to stereo and turn it to implicit when switching to mono.

Conflicts:
	Changelog
	cmdutils.h
	ffmpeg.c
	ffplay.c
	ffprobe.c
	libavcodec/avcodec.h
	libavcodec/mpc8.c
	libavcodec/v210dec.h
	libavcodec/version.h
	libavcodec/vorbisdec.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/buffersrc.c
	libavfilter/formats.c
	libavfilter/src_movie.c
	libavfilter/vf_aspect.c
	libavfilter/vf_blackframe.c
	libavfilter/vf_boxblur.c
	libavfilter/vf_crop.c
	libavfilter/vf_cropdetect.c
	libavfilter/vf_delogo.c
	libavfilter/vf_drawbox.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c
	libavfilter/vf_fifo.c
	libavfilter/vf_format.c
	libavfilter/vf_frei0r.c
	libavfilter/vf_gradfun.c
	libavfilter/vf_hflip.c
	libavfilter/vf_hqdn3d.c
	libavfilter/vf_libopencv.c
	libavfilter/vf_lut.c
	libavfilter/vf_overlay.c
	libavfilter/vf_pad.c
	libavfilter/vf_scale.c
	libavfilter/vf_select.c
	libavfilter/vf_showinfo.c
	libavfilter/vf_transpose.c
	libavfilter/vf_unsharp.c
	libavfilter/vf_yadif.c
	libavfilter/vsrc_color.c
	libavfilter/vsrc_testsrc.c
	libavformat/utils.c

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