RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
ffmpeg/libavfilter
History
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
..
libmpcodecs add bracket around the argument (fixes compilation error with ICL) 2012-06-09 00:34:21 +02:00
x86
…
Makefile Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
af_aconvert.c lavfi: drop planar/packed negotiation support 2012-05-16 13:16:05 +02:00
af_aformat.c Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
af_amerge.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
af_amix.c lavfi: replace AVFilterContext.input/output_count with nb_inputs/outputs 2012-06-13 11:13:22 +02:00
af_anull.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
af_aresample.c af_aresample: fix pts, they where off by a packet in the -async >0 case. 2012-05-26 16:22:46 +02:00
af_ashowinfo.c lavfi: drop planar/packed negotiation support 2012-05-16 13:16:05 +02:00
af_astreamsync.c af_astreamsync: set samples rate in query_formats. 2012-06-03 10:04:01 +02:00
af_asyncts.c lavfi: remove request/poll and drawing functions from public API on next bump 2012-06-05 09:38:16 +02:00
af_channelsplit.c lavfi: replace AVFilterContext.input/output_count with nb_inputs/outputs 2012-06-13 11:13:22 +02:00
af_earwax.c lavfi: drop planar/packed negotiation support 2012-05-16 13:16:05 +02:00
af_pan.c pan: use ff_parse_channel_layout() instead of av_get_channel_layout(). 2012-05-18 23:34:11 +02:00
af_resample.c lavfi: remove request/poll and drawing functions from public API on next bump 2012-06-05 09:38:16 +02:00
af_silencedetect.c lavfi: use av_default_item_name() as filter private context logger 2012-06-04 02:40:01 +02:00
af_volume.c lavfi: drop planar/packed negotiation support 2012-05-16 13:16:05 +02:00
all_channel_layouts.inc lavfi: rename all_channel_layouts.h to all_channel_layouts.inc. 2012-05-18 23:34:11 +02:00
allfilters.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
asink_anullsink.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
asrc_abuffer.h
…
asrc_aevalsrc.c lavfi: use av_default_item_name() as filter private context logger 2012-06-04 02:40:01 +02:00
asrc_anullsrc.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
audio.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
audio.h Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
avcodec.c lavfi: move definition of avfilter_copy_buf_props() from buffer.c to avcodec.c 2012-06-13 10:51:33 +02:00
avcodec.h
…
avfilter.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
avfilter.h Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
avfiltergraph.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
avfiltergraph.h
…
bbox.c
…
bbox.h
…
buffer.c lavfi: move definition of avfilter_copy_buf_props() from buffer.c to avcodec.c 2012-06-13 10:51:33 +02:00
bufferqueue.h lavfi: add a generic API for buffer queues. 2012-05-31 17:27:27 +02:00
buffersink.c Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
buffersink.h buffersink: add av_buffersink_get_frame_rate(). 2012-06-09 08:42:50 +02:00
buffersrc.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
buffersrc.h lavfi: unify src_buffer and buffersrc. 2012-05-19 10:59:52 +02:00
defaults.c lavfi: deprecate default config_props() callback and refactor avfilter_config_links() 2012-05-22 21:32:57 +02:00
drawutils.c drawutils: fix copyright 2012-05-24 05:08:49 +02:00
drawutils.h
…
formats.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
formats.h Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
gradfun.h
…
graphdump.c lavfi: drop planar/packed negotiation support 2012-05-16 13:16:05 +02:00
graphparser.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
internal.h Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
lavfutils.c lavfutils: fix incompatible pointer type warning 2012-05-26 20:45:59 +02:00
lavfutils.h
…
libavfilter.v libavfilter: export ff_default_query_formats() 2012-05-25 18:54:01 +02:00
lswsutils.c lswsutils: fix "ncompatible pointer type" warning 2012-05-26 20:46:00 +02:00
lswsutils.h
…
sink_buffer.c sink_buffer: dont return void from void functions. 2012-06-10 03:30:12 +02:00
split.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
src_buffer.c lavfi: unify src_buffer and buffersrc. 2012-05-19 10:59:52 +02:00
src_movie.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
transform.c
…
transform.h lavfi/transform: fix make checkheaders. 2012-05-18 23:34:11 +02:00
version.h Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
vf_aspect.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
vf_ass.c lavfi: use av_default_item_name() as filter private context logger 2012-06-04 02:40:01 +02:00
vf_bbox.c
…
vf_blackdetect.c lavfi: use av_default_item_name() as filter private context logger 2012-06-04 02:40:01 +02:00
vf_blackframe.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
vf_boxblur.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
vf_colormatrix.c
…
vf_copy.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
vf_crop.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
vf_cropdetect.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
vf_delogo.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
vf_deshake.c
…
vf_drawbox.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
vf_drawtext.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
vf_fade.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
vf_fieldorder.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
vf_fifo.c Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
vf_format.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
vf_fps.c vf_fps: set frame_rate. 2012-06-10 10:53:03 +02:00
vf_frei0r.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
vf_gradfun.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
vf_hflip.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
vf_hqdn3d.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
vf_idet.c
…
vf_libopencv.c vf_libopencv: add missing headers. 2012-06-10 08:02:02 +02:00
vf_lut.c Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
vf_mp.c
…
vf_null.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
vf_overlay.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
vf_pad.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
vf_pixdesctest.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
vf_removelogo.c
…
vf_scale.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
vf_select.c Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
vf_setfield.c
…
vf_setpts.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
vf_settb.c Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
vf_showinfo.c lavfi: make AVFilterPad opaque after two major bumps. 2012-06-13 11:11:33 +02:00
vf_slicify.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
vf_super2xsai.c
…
vf_swapuv.c
…
vf_thumbnail.c
…
vf_tile.c vf_tile: update deprecated functions. 2012-06-10 10:40:33 +02:00
vf_tinterlace.c
…
vf_transpose.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
vf_unsharp.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
vf_vflip.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
vf_yadif.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
video.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
video.h Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
vsink_nullsink.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
vsrc_buffer.h
…
vsrc_cellauto.c lavfi: use av_default_item_name() as filter private context logger 2012-06-04 02:40:01 +02:00
vsrc_color.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
vsrc_life.c lavfi: use av_default_item_name() as filter private context logger 2012-06-04 02:40:01 +02:00
vsrc_mandelbrot.c lavfi: use av_default_item_name() as filter private context logger 2012-06-04 02:40:01 +02:00
vsrc_mptestsrc.c lavfi: use av_default_item_name() as filter private context logger 2012-06-04 02:40:01 +02:00
vsrc_testsrc.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
yadif.h
…