ffmpeg/libswscale
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
..
bfin Merge remote-tracking branch 'qatar/master' 2012-04-13 21:50:37 +02:00
ppc Merge remote-tracking branch 'qatar/master' 2012-04-13 21:50:37 +02:00
sparc Merge remote-tracking branch 'qatar/master' 2012-04-13 21:50:37 +02:00
x86 MANGLEd swscale x86 asm to save registers 2012-06-05 03:02:41 +02:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-05-07 22:51:34 +02:00
colorspace-test.c colorspace-test: add few more tests 2012-06-09 14:38:51 +00:00
input.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
libswscale.v
options.c
output.c sws: remove cliping in yuv2rgb code. 2012-04-15 23:38:42 +02:00
rgb2rgb.c swscale: unscaled rgb48 <-> bgr48 2012-06-09 11:55:52 +00:00
rgb2rgb.h swscale: unscaled rgb48 <-> bgr48 2012-06-09 11:55:52 +00:00
rgb2rgb_template.c
swscale-test.c
swscale.c Merge remote-tracking branch 'qatar/master' 2012-04-13 21:50:37 +02:00
swscale.h
swscale_internal.h Merge remote-tracking branch 'qatar/master' 2012-04-13 21:50:37 +02:00
swscale_unscaled.c swscale: unscaled rgb48 <-> bgr48 2012-06-09 11:55:52 +00:00
utils.c Add yuva422p pix_fmt. 2012-05-08 08:39:37 +02:00
yuv2rgb.c yuv2rgb: remove assert() the codepath is not invalid 2012-06-07 18:01:09 +02:00