ffmpeg/libavdevice
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
..
Makefile dshow: rename dshow.h to avoid conflict with system header of equal name 2012-05-24 14:15:10 +02:00
alldevices.c
alsa-audio-common.c
alsa-audio-dec.c
alsa-audio-enc.c
alsa-audio.h
avdevice.c
avdevice.h avdevice: bump soname due to lavf soname bump 2012-05-25 12:22:21 +02:00
bktr.c bktr: use AV_OPT_TYPE_IMAGE_SIZE. 2012-05-20 18:24:20 +02:00
dshow.c dshow: rename dshow.h to avoid conflict with system header of equal name 2012-05-24 14:15:10 +02:00
dshow_capture.h dshow: rename dshow.h to avoid conflict with system header of equal name 2012-05-24 14:15:10 +02:00
dshow_common.c dshow: rename dshow.h to avoid conflict with system header of equal name 2012-05-24 14:15:10 +02:00
dshow_enummediatypes.c dshow: rename dshow.h to avoid conflict with system header of equal name 2012-05-24 14:15:10 +02:00
dshow_enumpins.c dshow: rename dshow.h to avoid conflict with system header of equal name 2012-05-24 14:15:10 +02:00
dshow_filter.c dshow: rename dshow.h to avoid conflict with system header of equal name 2012-05-24 14:15:10 +02:00
dshow_pin.c dshow: rename dshow.h to avoid conflict with system header of equal name 2012-05-24 14:15:10 +02:00
dv1394.c
dv1394.h
fbdev.c
jack_audio.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
lavfi.c lavfi: drop planar/packed negotiation support 2012-05-16 13:16:05 +02:00
libavdevice.v
libcdio.c
libdc1394.c
openal-dec.c
oss_audio.c
pulse.c
sdl.c sdl: fix aspect ratio computations. 2012-06-10 09:57:50 +02:00
sndio_common.c
sndio_common.h
sndio_dec.c
sndio_enc.c
timefilter.c
timefilter.h
v4l.c
v4l2.c v4l2: use AV_OPT_TYPE_IMAGE_SIZE. 2012-05-20 18:24:20 +02:00
vfwcap.c
x11grab.c x11grab: use AV_OPT_TYPE_IMAGE_SIZE. 2012-05-20 18:24:20 +02:00