Michael Niedermayer
b536e2facf
Merge remote-tracking branch 'qatar/master' ...
* qatar/master:
avconv: add an assert to silence an uninitialized variable warning.
avconv: shut up an uninitialized variable warning.
avfiltergraph: shut up uninitialized variable warning.
af_join: initialize a variable to shut up gcc warning.
amix: fix format specifier for AVFilterLink.sample_rate.
lavfi: make filters less verbose.
mpc8: read APE tags.
lavr: x86: fix ff_conv_fltp_to_flt_6ch function prototypes
libm: provide fallback definition for cbrtf() using powf()
network: Don't redefine error codes if they already exist in errno.h
configure: Check for sys/time.h
network: Include unistd.h from network.h
avconv: don't include vsrc_buffer.h, which doesn't exist anymore
lavfi: reorder AVFilterLink fields.
lavfi: reorder AVFilterContext fields.
lavfi: reorder AVFilter fields.
lavfi: reorder AVFilterBufferRef fields.
lavfi: reorder AVFilterBuffer fields.
Conflicts:
configure
libavcodec/v210dec.h
libavfilter/asrc_anullsrc.c
libavfilter/avfilter.h
libavfilter/buffersrc.c
libavfilter/src_movie.c
libavfilter/vf_aspect.c
libavfilter/vf_crop.c
libavfilter/vf_drawbox.c
libavfilter/vf_fade.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
libavfilter/vf_scale.c
libavfilter/vsrc_color.c
libavformat/network.h
libavutil/libm.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-27 01:58:09 +02:00
2012-05-29 19:56:07 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-05-31 16:14:27 +02:00
2012-01-28 07:53:34 +01:00
2012-06-03 02:56:52 +02:00
2012-01-31 07:50:31 +01:00
2012-04-06 22:52:01 +02:00
2012-05-01 23:20:52 +02:00
2012-04-06 22:52:01 +02:00
2012-06-21 02:27:53 +00:00
2012-06-18 20:07:00 +02:00
2012-01-28 07:53:34 +01:00
2012-05-01 23:20:52 +02:00
2012-06-24 21:34:54 +02:00
2012-02-25 04:00:43 +01:00
2012-02-10 01:20:07 +01:00
2012-03-29 04:11:10 +02:00
2012-06-14 02:45:11 +02:00
2012-04-06 22:52:01 +02:00
2012-01-28 07:53:34 +01:00
2012-05-01 23:20:52 +02:00
2012-04-01 21:21:13 +02:00
2012-03-25 01:56:53 +01:00
2012-03-25 01:56:53 +01:00
2012-06-22 22:34:02 +02:00
2012-06-19 16:26:01 +00:00
2012-06-17 17:10:05 +02:00
2012-06-22 22:34:02 +02:00
2012-06-20 01:56:03 +00:00
2012-06-15 19:44:42 +02:00
2012-06-05 11:13:30 +02:00
2012-03-03 00:23:10 +01:00
2012-02-17 00:35:06 +01:00
2012-01-28 07:53:34 +01:00
2012-06-09 10:57:14 +00:00
2012-06-09 14:36:41 +02:00
2012-01-28 07:53:34 +01:00
2012-03-03 04:30:49 +01:00
2012-04-06 19:19:59 +03:00
2012-02-16 01:34:37 +01:00
2012-02-06 02:04:09 +01:00
2012-06-21 22:37:43 +02:00
2012-01-23 17:18:13 +01:00
2012-05-10 04:17:03 +02:00
2012-03-05 16:27:31 -05:00
2012-02-16 01:34:37 +01:00
2012-04-20 22:18:26 +02:00
2012-04-06 22:52:01 +02:00
2012-01-28 07:53:34 +01:00
2012-04-06 22:52:01 +02:00
2012-05-31 23:50:08 +02:00
2012-02-16 01:34:37 +01:00
2012-06-04 07:41:22 +02:00
2012-03-01 03:17:11 +01:00
2012-01-28 07:53:34 +01:00
2012-05-05 20:22:09 +02:00
2012-05-07 02:42:00 +02:00
2012-06-16 17:59:01 +02:00
2012-01-28 07:53:34 +01:00
2012-06-15 15:05:33 +02:00
2012-04-06 22:52:01 +02:00
2012-06-16 23:22:42 +02:00
2012-04-06 22:52:01 +02:00
2012-01-28 07:53:34 +01:00
2012-03-20 07:53:40 +01:00
2012-06-19 20:53:27 +02:00
2012-06-11 20:14:22 +02:00
2012-05-20 19:50:32 -04:00
2012-02-03 09:29:02 +01:00
2012-05-30 01:40:54 +02:00
2012-01-28 07:53:34 +01:00
2012-02-22 02:24:18 +01:00
2012-05-01 23:20:52 +02:00
2012-03-19 13:33:24 +01:00
2012-06-04 07:41:22 +02:00
2012-06-22 22:34:02 +02:00
2012-06-22 22:34:02 +02:00
2012-06-20 20:47:46 +02:00
2012-05-30 01:40:54 +02:00
2012-03-14 02:10:11 +01:00
2012-03-14 02:10:11 +01:00
2012-01-28 07:53:34 +01:00
2012-01-29 00:34:59 +01:00
2012-05-20 16:29:08 +02:00
2012-03-01 03:17:11 +01:00
2012-03-01 03:17:11 +01:00
2012-01-28 07:53:34 +01:00
2012-05-20 22:58:04 +02:00
2012-05-20 22:58:04 +02:00
2012-05-20 22:58:04 +02:00
2012-06-19 20:53:27 +02:00
2012-04-06 08:32:09 +02:00
2012-06-24 21:34:54 +02:00
2012-06-24 21:34:54 +02:00
2012-05-01 23:20:52 +02:00
2012-03-21 01:33:53 +01:00
2012-05-31 16:19:26 +02:00
2012-06-19 20:53:27 +02:00
2012-06-11 07:35:14 +02:00
2012-05-20 22:58:04 +02:00
2012-04-06 22:52:01 +02:00
2012-06-21 22:37:43 +02:00
2012-04-06 22:52:01 +02:00
2012-05-31 22:12:46 +02:00
2012-05-03 19:37:14 +02:00
2012-04-19 21:43:15 +02:00
2012-04-14 18:21:19 +02:00
2012-03-12 06:04:37 +01:00
2012-01-28 07:53:34 +01:00
2012-05-21 08:51:50 +02:00
2012-06-04 00:33:42 +02:00
2012-01-28 07:53:34 +01:00
2012-02-01 02:36:09 +01:00
2012-03-31 12:37:42 +02:00
2012-06-27 01:58:09 +02:00
2012-03-01 03:17:11 +01:00
2012-06-15 01:35:52 +02:00
2012-05-21 23:53:39 +02:00
2012-05-21 23:53:39 +02:00
2012-01-29 00:34:59 +01:00
2012-01-28 07:53:34 +01:00
2012-03-26 20:03:57 +02:00
2012-06-15 18:40:14 +02:00
2012-01-28 07:53:34 +01:00
2012-03-23 00:50:49 +01:00
2012-05-01 23:20:52 +02:00
2012-06-20 20:47:46 +02:00
2012-06-17 17:51:50 +03:00
2012-02-28 20:48:43 +01:00
2012-06-26 13:12:50 +02:00
2012-06-19 20:53:27 +02:00
2012-06-11 07:35:14 +02:00
2012-05-26 22:37:37 +02:00
2012-05-30 09:08:29 -07:00
2012-05-13 16:49:17 +02:00
2012-06-27 01:58:09 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-05-06 21:53:19 +02:00
2012-06-19 20:53:27 +02:00
2012-02-29 00:30:35 +01:00
2012-06-13 18:51:38 +02:00
2012-03-09 22:25:32 +01:00
2012-03-10 18:32:02 +01:00
2012-01-28 07:53:34 +01:00
2012-05-20 22:58:04 +02:00
2012-04-06 22:52:01 +02:00
2012-03-10 18:01:03 +01:00
2012-04-19 15:08:13 +02:00
2012-05-27 15:42:45 +02:00
2012-06-06 17:13:28 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-06-27 01:58:09 +02:00
2012-06-27 01:58:09 +02:00
2012-05-06 21:53:19 +02:00
2012-04-06 22:52:01 +02:00
2012-05-08 10:37:13 +02:00
2012-05-16 03:13:35 +02:00
2012-06-15 19:44:42 +02:00
2012-04-06 22:52:01 +02:00
2012-06-02 22:50:40 +02:00
2012-04-01 00:36:43 +02:00
2012-03-29 04:11:10 +02:00
2012-04-18 15:30:34 +02:00
2012-03-23 04:29:33 +01:00
2012-05-05 00:00:40 +02:00
2012-05-31 20:25:23 +02:00
2012-04-16 18:36:39 +02:00
2012-04-16 18:36:39 +02:00
2012-05-10 17:22:27 +02:00
2012-02-29 14:26:14 +01:00
2012-05-10 02:25:41 +02:00
2012-06-19 17:22:07 +02:00
2012-06-27 01:58:09 +02:00
2012-05-23 21:48:31 +02:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-06-14 23:52:23 +02:00
2012-02-28 07:20:36 +01:00
2012-03-04 04:26:04 +01:00
2012-04-06 22:52:01 +02:00
2012-01-28 07:53:34 +01:00
2012-03-10 01:12:08 +01:00
2012-06-14 23:52:40 +02:00
2012-02-01 02:36:09 +01:00
2012-06-21 20:52:56 +02:00
2012-04-06 22:52:01 +02:00
2012-03-06 06:03:32 +01:00
2012-06-21 13:25:50 +02:00
2012-05-31 00:46:02 +02:00
2012-02-29 00:30:35 +01:00
2012-03-20 00:03:19 +01:00
2012-04-20 22:18:26 +02:00
2012-04-29 13:03:15 +02:00
2012-01-28 07:53:34 +01:00
2012-05-01 23:20:52 +02:00
2012-06-22 22:34:02 +02:00
2012-06-15 00:14:21 +02:00
2012-06-15 00:14:21 +02:00
2012-06-19 20:53:27 +02:00
2012-02-24 02:57:18 +01:00
2012-02-17 00:35:06 +01:00
2012-04-08 20:55:11 +02:00
2012-04-08 20:55:11 +02:00
2012-06-19 20:53:27 +02:00
2012-06-14 22:11:43 +03:00
2012-02-19 01:47:10 +01:00
2012-06-20 20:47:46 +02:00
2012-06-19 20:53:27 +02:00
2012-04-08 20:55:11 +02:00
2012-04-08 20:55:11 +02:00
2012-02-07 01:40:29 +01:00
2012-04-08 20:55:11 +02:00
2012-06-19 20:53:27 +02:00
2012-01-29 00:34:59 +01:00
2012-05-26 22:37:37 +02:00
2012-05-26 22:37:37 +02:00
2012-03-01 16:08:32 +02:00
2012-06-17 00:38:39 +02:00
2012-06-18 20:07:00 +02:00
2012-01-29 00:34:59 +01:00
2012-06-19 20:53:27 +02:00
2012-06-18 20:07:00 +02:00
2012-06-20 20:47:46 +02:00
2012-06-20 20:47:46 +02:00
2012-05-10 02:25:41 +02:00
2012-04-08 20:55:11 +02:00
2012-06-20 20:47:46 +02:00
2012-06-20 20:47:46 +02:00
2012-05-26 22:37:37 +02:00
2012-02-23 16:00:22 +01:00
2012-06-26 17:22:21 +03:00
2012-06-19 20:53:27 +02:00
2012-05-04 14:40:22 +02:00
2012-03-06 06:03:32 +01:00
2012-03-06 06:03:32 +01:00
2012-04-16 02:18:09 +02:00
2012-06-15 20:56:06 +02:00
2012-01-28 07:53:34 +01:00
2012-04-06 22:52:01 +02:00
2012-04-22 11:23:58 +02:00
2012-01-17 02:37:30 +01:00
2012-01-16 11:29:55 +01:00
2012-02-14 10:12:44 +01:00
2012-05-20 19:50:32 -04:00
2012-06-21 12:14:53 +00:00
2012-05-01 23:20:52 +02:00
2012-05-01 23:20:52 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-06-15 18:40:14 +02:00
2012-06-21 20:52:56 +02:00
2012-05-18 23:34:11 +02:00
2012-04-03 19:12:52 +02:00
2012-06-07 21:30:07 +02:00
2012-06-27 01:58:09 +02:00
2012-03-04 04:26:04 +01:00
2012-03-04 04:26:04 +01:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-06-27 01:58:09 +02:00
2012-06-01 14:47:30 +02:00
2012-06-22 01:58:57 +02:00
2012-04-06 22:52:01 +02:00
2012-06-21 22:37:43 +02:00
2012-02-16 01:34:37 +01:00
2012-04-06 22:52:01 +02:00
2012-06-25 03:45:29 +02:00
2012-03-04 04:26:04 +01:00
2012-05-21 23:53:39 +02:00
2012-01-28 07:53:34 +01:00
2012-02-01 04:43:06 +01:00
2012-03-27 11:58:15 -04:00
2012-06-25 16:20:08 +03:00
2012-06-25 16:55:31 +02:00
2012-02-10 01:20:07 +01:00
2012-03-21 01:33:53 +01:00
2012-06-07 21:09:06 +02:00
2012-03-22 23:16:49 +01:00
2012-05-31 14:47:15 +02:00
2012-05-08 16:53:03 +02:00
b536e2facf