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