Michael Niedermayer
f9a2d0c3fe
Merge remote-tracking branch 'qatar/master' ...
* qatar/master: (23 commits)
avconv: Reformat s16 volume adjustment.
ARM: NEON optimised vector_fmac_scalar()
dca: use vector_fmac_scalar from dsputil
dsputil: add vector_fmac_scalar()
latmenc: Fix private options
vf_unsharp: store hsub/vsub in the filter context
vf_unsharp: adopt a more natural order of params in apply_unsharp()
vf_unsharp: rename method "unsharpen" to "apply_unsharp"
vf_scale: apply the same transform to the aspect during init that is applied per frame
vf_pad: fix "vsub" variable value computation
vf_scale: add a "sar" variable
lavfi: fix realloc size computation in avfilter_add_format()
vsrc_color: use internal timebase
lavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config()
graphparser: prefer void * over AVClass * for log contexts
avfiltergraph: use meaningful error codes
avconv: Initialize return value for codec copy path.
fate: use 'run' helper for seek-test
fate: remove seek-mpeg2reuse test
Fix memory (re)allocation in matroskadec.c, related to MSVR-11-0080.
...
Conflicts:
doc/filters.texi
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/avfiltergraph.h
libavfilter/graphparser.c
libavfilter/vf_scale.c
libavfilter/vsrc_color.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-29 01:11:01 +02:00
2011-09-28 18:13:52 +02:00
2011-07-17 20:12:02 +02:00
2011-07-31 19:40:08 +02:00
2011-07-17 20:12:02 +02:00
2011-09-26 00:24:01 +02:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-09-24 21:11:01 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-09-12 21:12:31 +02:00
2011-06-09 04:47:19 +02:00
2011-03-19 13:33:20 +00:00
2011-08-04 20:59:36 +02:00
2011-05-13 04:40:40 +02:00
2011-03-19 13:33:20 +00:00
2011-04-17 23:43:54 +02:00
2011-06-24 03:07:04 +02:00
2011-03-19 13:33:20 +00:00
2011-09-12 22:12:14 +02:00
2011-09-09 03:34:27 +02:00
2011-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-08-14 00:05:36 +02:00
2011-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-03-19 13:33:20 +00:00
2011-09-23 04:21:02 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-09-28 18:13:52 +02:00
2011-09-28 18:13:52 +02:00
2011-05-22 04:53:19 +02:00
2011-06-01 20:29:27 +02:00
2011-07-03 03:14:10 +02:00
2011-09-28 18:13:52 +02:00
2011-09-10 05:24:39 +02:00
2011-09-08 22:37:31 +02:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-09-14 19:51:07 +02:00
2011-09-28 16:11:01 +02:00
2011-09-25 12:29:20 +02:00
2011-07-17 20:12:02 +02:00
2011-08-01 00:58:49 +02:00
2011-04-28 10:45:32 +02:00
2011-09-14 19:51:07 +02:00
2011-08-22 09:35:58 +02:00
2011-05-27 23:48:22 +02:00
2011-07-17 20:12:02 +02:00
2011-04-09 03:17:07 +02:00
2011-07-17 20:12:02 +02:00
2011-06-09 02:43:55 +02:00
2011-05-01 00:26:05 +02:00
2011-09-24 22:39:52 +02:00
2011-07-17 20:12:02 +02:00
2011-05-27 23:48:22 +02:00
2011-05-27 23:48:22 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-09-14 19:51:07 +02:00
2011-05-02 18:38:01 +02:00
2011-08-26 20:53:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-08-09 19:56:25 +02:00
2011-09-14 19:51:07 +02:00
2011-09-07 07:27:55 +02:00
2011-05-22 04:53:19 +02:00
2011-07-04 00:45:21 +02:00
2011-06-09 04:47:19 +02:00
2011-05-05 03:30:24 +02:00
2011-09-14 19:51:07 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-09-07 02:36:42 +02:00
2011-09-25 12:55:21 +03:00
2011-09-07 02:38:15 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-04-21 03:37:05 +02:00
2011-08-03 20:06:38 +02:00
2011-03-19 13:33:20 +00:00
2011-09-28 18:13:52 +02:00
2011-05-27 23:48:22 +02:00
2011-05-27 23:48:22 +02:00
2011-05-27 23:48:22 +02:00
2011-09-05 03:10:45 +02:00
2011-04-09 03:17:07 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-06-09 04:47:19 +02:00
2011-03-19 13:33:20 +00:00
2011-09-25 23:01:43 +02:00
2011-09-25 23:01:43 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-09-24 22:39:52 +02:00
2011-09-23 00:35:31 +02:00
2011-09-27 21:32:39 +02:00
2011-09-17 22:36:43 +02:00
2011-07-14 02:24:10 +02:00
2011-07-17 20:12:02 +02:00
2011-09-23 00:35:31 +02:00
2011-08-26 01:29:40 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-03-19 13:33:20 +00:00
2011-09-14 19:53:39 +02:00
2011-09-29 01:11:01 +02:00
2011-01-30 03:40:58 +01:00
2011-07-17 20:12:02 +02:00
2011-07-06 01:34:08 +02:00
2011-07-17 20:12:02 +02:00
2011-08-20 00:27:38 +02:00
2011-04-07 03:32:26 +02:00
2011-05-27 23:48:22 +02:00
2011-09-26 13:51:29 +02:00
2011-05-24 23:34:24 +02:00
2011-05-29 03:34:35 +02:00
2011-09-29 01:11:01 +02:00
2011-09-28 02:07:44 +02:00
2011-07-17 20:12:02 +02:00
2011-04-20 04:48:23 +02:00
2011-06-09 04:47:19 +02:00
2011-06-09 04:47:19 +02:00
2011-04-04 01:29:40 +02:00
2011-04-04 01:29:40 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-04-20 04:48:23 +02:00
2011-05-22 04:53:19 +02:00
2011-07-04 00:45:21 +02:00
2011-05-17 03:05:36 +02:00
2011-09-21 23:42:03 +02:00
2011-09-28 18:13:52 +02:00
2011-06-11 03:51:36 +02:00
2011-07-11 04:23:25 +02:00
2011-09-21 00:51:53 +02:00
2011-08-28 21:43:04 +02:00
2011-09-25 23:01:43 +02:00
2011-07-17 20:12:02 +02:00
2011-09-24 22:39:52 +02:00
2011-03-19 13:33:20 +00:00
2011-09-01 01:31:03 +02:00
2011-09-21 21:25:43 +02:00
2011-03-19 13:33:20 +00:00
2011-08-27 23:57:24 +02:00
2011-05-27 23:48:22 +02:00
2011-08-09 19:56:25 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-09-27 22:27:52 +02:00
2011-03-19 13:33:20 +00:00
2011-09-27 15:15:54 +02:00
2011-09-16 18:16:30 +02:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-06-05 03:00:31 +02:00
2011-09-14 19:53:45 +02:00
2011-07-17 20:12:02 +02:00
2011-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-09-05 03:10:45 +02:00
2011-09-18 18:25:44 +02:00
2011-09-26 13:51:29 +02:00
2011-09-26 13:51:29 +02:00
2011-08-10 21:03:39 +02:00
2011-09-27 02:14:37 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-06-02 20:06:00 +01:00
2011-03-19 13:33:20 +00:00
2011-04-17 23:59:00 +02:00
2011-02-06 16:08:59 -05:00
2011-06-08 07:43:45 +02:00
2011-09-21 21:25:43 +02:00
2011-09-04 04:11:53 +02:00
2011-05-13 04:40:40 +02:00
2011-04-24 03:41:22 +02:00
2011-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-09-24 22:39:52 +02:00
2011-09-24 22:39:52 +02:00
2011-04-06 19:30:42 +02:00
2011-09-23 19:10:55 +02:00
2011-07-17 20:12:02 +02:00
2011-07-15 17:51:09 +02:00
2011-03-19 13:33:20 +00:00
2011-09-14 19:53:45 +02:00
2011-09-23 00:35:31 +02:00
2011-09-17 22:36:43 +02:00
2011-07-17 20:12:02 +02:00
2011-03-19 13:33:20 +00:00
2011-09-17 22:36:43 +02:00
2011-06-18 05:10:38 +02:00
2011-07-14 20:44:58 +02:00
2011-09-25 04:33:16 +02:00
2011-04-15 04:50:06 +02:00
2011-07-17 20:12:02 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-09-19 22:45:34 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-03-19 13:33:20 +00:00
2011-07-04 00:45:21 +02:00
2011-07-03 03:14:10 +02:00
2011-09-23 00:35:31 +02:00
2011-09-27 02:14:37 +02:00
2011-09-27 02:14:37 +02:00
2011-04-24 03:41:22 +02:00
2011-09-08 22:37:31 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-24 03:41:22 +02:00
2011-06-03 05:19:30 +02:00
2011-04-24 03:41:22 +02:00
2011-04-24 03:41:22 +02:00
2011-05-13 04:40:40 +02:00
2011-04-24 03:41:22 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-04-24 03:41:22 +02:00
2011-07-22 12:08:52 +02:00
2011-04-24 03:41:22 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-06-18 05:10:38 +02:00
2011-04-09 03:17:07 +02:00
2011-03-19 13:33:20 +00:00
2011-06-15 20:21:33 +02:00
2011-06-17 05:49:58 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-09-27 02:14:37 +02:00
2011-06-11 03:51:36 +02:00
2011-07-25 16:37:12 +02:00
2011-07-19 18:46:04 +02:00
2011-07-19 18:46:04 +02:00
2011-03-19 13:33:20 +00:00
2011-09-20 21:58:15 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-06-09 04:47:19 +02:00
2011-03-19 13:33:20 +00:00
2011-09-27 02:14:37 +02:00
2011-08-26 23:18:54 +02:00
2011-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-09-12 21:45:23 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-09-12 23:44:51 +03:00
2011-09-27 02:14:37 +02:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-03-19 13:33:20 +00:00
2011-05-22 04:53:19 +02:00
2011-07-17 20:12:02 +02:00
2011-08-01 00:58:49 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-09-27 14:52:46 +02:00
2011-07-17 20:12:02 +02:00
2011-05-30 02:39:26 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-04-12 03:48:21 +02:00
2011-03-19 13:33:20 +00:00
2011-09-14 19:53:45 +02:00
2011-09-14 19:53:45 +02:00
2011-08-15 23:35:53 +02:00
2011-09-24 22:39:52 +02:00
2011-08-25 21:43:30 +02:00
2011-07-14 20:44:58 +02:00
2011-09-27 02:14:37 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-09-23 00:35:31 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-08-27 22:12:51 +02:00
2011-07-17 20:12:02 +02:00
2011-06-09 04:47:19 +02:00
2011-06-09 04:47:19 +02:00
2011-07-17 20:12:02 +02:00
2011-09-01 20:23:40 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-09-08 01:55:07 +02:00
2011-09-08 01:55:07 +02:00
2011-09-14 19:53:45 +02:00
2011-09-26 00:22:41 +02:00
2011-08-21 15:27:02 +02:00
2011-07-17 20:12:02 +02:00
2011-08-26 16:26:57 +02:00
2011-07-17 20:12:02 +02:00
2011-09-14 19:53:45 +02:00
2011-07-17 20:12:02 +02:00
f9a2d0c3fe