Michael Niedermayer
c7b9eab2be
Merge remote-tracking branch 'qatar/master' ...
* qatar/master:
rtmp: Add a new option 'rtmp_buffer', for setting the client buffer time
rtmp: Set the client buffer time to 3s instead of 0.26s
rtmp: Handle server bandwidth packets
rtmp: Display a verbose message when an unknown packet type is received
lavfi/audio: use av_samples_copy() instead of custom code.
configure: add all filters hardcoded into avconv to avconv_deps
avfiltergraph: remove a redundant call to avfilter_get_by_name().
lavfi: allow building without swscale.
build: Do not delete tests/vsynth2 directory, which is no longer created.
lavfi: replace AVFilterContext.input/output_count with nb_inputs/outputs
lavfi: make AVFilterPad opaque after two major bumps.
lavfi: add avfilter_pad_get_type() and avfilter_pad_get_name().
lavfi: make avfilter_get_video_buffer() private on next bump.
jack: update to new latency range API as the old one has been deprecated
rtmp: Tokenize the AMF connection parameters manually instead of using strtok_r
ppc: Rename H.264 optimization template file for consistency.
lavfi: add channelsplit audio filter.
golomb: check remaining bits during unary decoding in get_ur_golomb_jpegls()
sws: fix planar RGB input conversions for 9/10/16 bpp.
Conflicts:
Changelog
configure
doc/APIchanges
ffmpeg.c
libavcodec/golomb.h
libavcodec/v210dec.h
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/asrc_anullsrc.c
libavfilter/audio.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/buffersrc.c
libavfilter/formats.c
libavfilter/version.h
libavfilter/vf_frei0r.c
libavfilter/vf_pad.c
libavfilter/vf_scale.c
libavfilter/video.h
libavfilter/vsrc_color.c
libavformat/rtmpproto.c
libswscale/input.c
tests/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-13 22:43:57 +02:00
2012-04-22 22:26:55 +02:00
2012-06-08 23:59:09 +02:00
2012-06-11 21:12:39 +02:00
2012-06-13 22:43:57 +02:00
2012-06-10 03:26:24 +02:00
2012-06-11 21:40:43 +02:00
2012-06-01 02:32:00 +02:00
2012-06-08 23:59:09 +02:00
2012-06-06 18:35:05 +02:00
2012-06-08 23:59:09 +02:00
2012-06-08 23:59:09 +02:00
2012-06-08 23:59:09 +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-06-08 23:59:09 +02:00
2012-06-08 23:59:09 +02:00
2012-06-08 23:59:09 +02:00
2012-06-08 23:59:09 +02:00
2012-06-08 13:14:38 -04:00
2012-06-11 21:12:39 +02:00
2012-06-11 21:12:39 +02:00
2012-06-11 21:12:39 +02:00
2012-06-11 21:12:39 +02:00
2012-05-01 22:06:55 +02:00
2012-06-06 01:08:33 +02:00
2012-05-05 13:19:35 +02:00
2012-06-11 21:12:39 +02:00
2012-06-11 21:12:39 +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-06-08 23:59:09 +02:00
2012-05-15 02:31:28 +02:00
2012-05-08 00:25:25 +02:00
2012-06-06 01:08:33 +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-06-02 19:56:10 +02:00
2012-06-09 10:43:20 +00:00
2012-06-12 20:47:38 +00:00
2012-06-04 00:33:42 +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-05-28 17:24:13 +02:00
2012-06-11 21:12:39 +02:00
2012-06-11 21:12:39 +02:00
2012-06-11 21:12:39 +02:00
2012-06-11 21:12:39 +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-05-07 18:55:44 +02:00
2012-06-12 20:47:38 +00:00
2012-05-18 23:34:11 +02:00
2012-06-10 20:45:55 +02:00
2012-05-06 21:53:19 +02:00
2012-05-04 18:50:59 +02:00
2012-06-09 20:09:43 +02:00
2012-04-21 21:39:18 +02:00
2012-06-01 12:14:49 +02:00
2012-06-08 23:59:09 +02:00
2012-06-08 23:59:09 +02:00
2012-05-16 03:10:16 +02:00
2012-05-08 22:02:59 +02:00
2012-04-19 21:23:52 +02:00
2012-06-04 20:42:00 +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-05-23 21:48:31 +02:00
2012-05-23 21:48:31 +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-06-12 20:47:38 +00:00
2012-05-30 12:07:41 +00:00
2012-04-26 22:24:58 +02:00
2012-06-12 20:47:38 +00:00
2012-05-14 01:42:51 +02:00
2012-05-12 13:11:56 +02:00
2012-05-20 16:29:08 +02:00
2012-05-25 13:40:12 +02:00
2012-06-01 23:22:54 +02:00
2012-05-18 23:34:11 +02:00
2012-05-08 22:04:01 +02:00
2012-05-18 23:34:11 +02:00
2012-05-31 16:59:25 +02:00
2012-06-12 14:33:39 -04:00
2012-06-07 21:31:22 +02:00
2012-06-07 21:32:32 +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-06-07 21:07:17 +02:00
2012-05-03 21:02:32 +02:00
2012-04-23 19:41:46 +02:00
2012-06-10 02:24:25 +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-05-30 07:50:32 +00:00
2012-06-09 20:30:17 +02:00
2012-06-09 20:30:17 +02:00
2012-05-08 08:39:37 +02:00
2012-05-16 22:32:05 +02:00
2012-06-09 20:30:17 +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-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-06-10 23:27:17 +02:00
2012-06-12 20:47:38 +00: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-05-09 11:58:08 +02:00
2012-06-12 20:47:38 +00:00
2012-06-10 21:34:15 +02:00
2012-06-09 23:34:15 +00:00
2012-06-12 20:47:38 +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-19 01:58:30 +02:00
2012-05-18 23:34:11 +02:00
2012-06-12 22:12:26 +00:00
2012-06-12 22:12:26 +00:00
2012-06-11 02:06:43 +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-06-11 21:12:39 +02:00
2012-06-03 15:01:34 +02:00
2012-06-12 22:12:26 +00:00
2012-05-29 21:33:28 +02:00
2012-04-22 22:26:55 +02:00
2012-05-25 13:40:12 +02:00
2012-06-12 20:47:38 +00: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 13:09:02 +02:00
2012-05-22 14:59:02 +02:00
2012-05-31 20:25:23 +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-05-14 11:26:44 +02:00
2012-06-06 19:26:21 +02:00
2012-05-07 20:08:56 +02:00
2012-05-25 13:40:12 +02:00
2012-05-25 13:40:12 +02:00
2012-06-08 23:59:09 +02:00
2012-05-10 02:25:41 +02:00
2012-06-03 21:55:50 +02:00
2012-05-30 19:32:06 +02:00
2012-05-17 23:45:00 +02:00
2012-04-30 19:48:21 +02:00
2012-06-02 21:12:20 +02:00
2012-05-05 20:22:09 +02:00
2012-06-11 21:41:03 +02:00
2012-06-04 12:18:56 +02:00
2012-05-04 18:50:59 +02:00
2012-05-07 22:51:34 +02:00
2012-06-06 21:18:14 +02:00
2012-06-01 00:35:06 +02:00
2012-05-28 19:05:15 +02:00
2012-05-28 19:05:15 +02:00
2012-06-08 23:59:09 +02:00
2012-05-22 23:42:17 +02:00
2012-06-10 23:36:22 +02:00
2012-06-05 12:13:39 +02:00
2012-05-27 01:13:37 +02:00
2012-06-07 20:51:07 +02:00
2012-06-08 18:24:47 +02:00
2012-06-11 20:13:31 +02:00
2012-04-29 21:45:54 +02:00
2012-04-28 11:16:07 -07:00
2012-04-29 21:45:54 +02:00
2012-05-22 23:42:17 +02:00
2012-06-01 01:14:49 +02:00
2012-05-22 11:56:18 +00:00
2012-06-08 11:44:50 +02:00
2012-05-22 23:42:17 +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-22 11:10:17 +02:00
2012-06-07 18:01:09 +02:00
2012-05-08 11:02:12 +02:00
2012-06-10 15:40:24 +02:00
2012-05-30 16:20:22 +02:00
2012-05-16 22:32:05 +02:00
2012-06-08 23:59:09 +02:00
2012-05-07 22:51:34 +02:00
2012-06-13 11:30:48 +02:00
2012-04-21 22:56:07 +02:00
2012-04-21 22:31:11 +02:00
2012-06-13 22:43:57 +02:00
2012-04-19 11:16:56 +02:00
2012-06-08 23:59:09 +02:00
2012-05-14 20:17:24 +02:00
2012-06-06 01:08:33 +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-08 23:59:09 +02:00
2012-06-06 01:08:33 +02:00
2012-05-31 21:27:42 +02:00
2012-05-11 20:57:39 +02:00
2012-05-06 21:53:19 +02:00
2012-04-22 03:49:13 +02:00
2012-04-21 18:56:19 +01:00
2012-06-06 21:18:47 +02:00
2012-06-01 23:22:54 +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-20 21:08:35 +02:00
2012-06-01 15:52:20 +02:00
2012-05-07 22:51:34 +02:00
c7b9eab2be