RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-19 05:55:07 +00:00
Code Issues Projects Releases Wiki Activity
c8a11014b6
ffmpeg/libavfilter
History
Michael Niedermayer ad60b3b181 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  vorbis: Validate that the floor 1 X values contain no duplicates.
  avprobe: Identify codec probe failures rather than calling them unsupported codecs.
  avformat: Probe codecs at score 0 on buffer exhaustion conditions.
  avformat: Factorize codec probing.
  Indeo Audio decoder
  imc: make IMDCT support stereo output
  imc: move channel-specific data into separate context
  lavfi: remove request/poll and drawing functions from public API on next bump
  lavfi: make avfilter_insert_pad and pals private on next bump.
  lavfi: make formats API private on next bump.
  avplay: use buffersrc instead of custom input filter.
  avtools: move buffer management code from avconv to cmdutils.
  avconv: don't use InputStream in the buffer management code.
  avconv: fix exiting when max frames is reached.
  mpc8: fix maximum bands handling
  aacdec: Turn PS off when switching to stereo and turn it to implicit when switching to mono.

Conflicts:
	Changelog
	cmdutils.h
	ffmpeg.c
	ffplay.c
	ffprobe.c
	libavcodec/avcodec.h
	libavcodec/mpc8.c
	libavcodec/v210dec.h
	libavcodec/version.h
	libavcodec/vorbisdec.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/buffersrc.c
	libavfilter/formats.c
	libavfilter/src_movie.c
	libavfilter/vf_aspect.c
	libavfilter/vf_blackframe.c
	libavfilter/vf_boxblur.c
	libavfilter/vf_crop.c
	libavfilter/vf_cropdetect.c
	libavfilter/vf_delogo.c
	libavfilter/vf_drawbox.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c
	libavfilter/vf_fifo.c
	libavfilter/vf_format.c
	libavfilter/vf_frei0r.c
	libavfilter/vf_gradfun.c
	libavfilter/vf_hflip.c
	libavfilter/vf_hqdn3d.c
	libavfilter/vf_libopencv.c
	libavfilter/vf_lut.c
	libavfilter/vf_overlay.c
	libavfilter/vf_pad.c
	libavfilter/vf_scale.c
	libavfilter/vf_select.c
	libavfilter/vf_showinfo.c
	libavfilter/vf_transpose.c
	libavfilter/vf_unsharp.c
	libavfilter/vf_yadif.c
	libavfilter/vsrc_color.c
	libavfilter/vsrc_testsrc.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-06 01:08:33 +02:00
..
libmpcodecs
x86
af_aconvert.c
af_aformat.c Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
af_amerge.c af_amerge: use the buferqueue API. 2012-06-03 10:04:01 +02:00
af_amix.c lavfi: remove request/poll and drawing functions from public API on next bump 2012-06-05 09:38:16 +02:00
af_anull.c af_null: fix copyright 2012-05-24 05:08:48 +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
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_earwax.c
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
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-05-25 00:38:16 +02:00
asink_anullsink.c asink_anullsink: fix copyright 2012-05-24 05:08:48 +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 lavfi: use av_default_item_name() as filter private context logger 2012-06-04 02:40:01 +02:00
audio.c Merge commit '755cd4197d53946208e042f095b930dca18d9430' 2012-05-19 20:31:24 +02:00
audio.h
avcodec.c lavfi: move avfilter_copy_frame_props() definition from buffer.c to avcodec.c 2012-06-05 18:39:47 +02:00
avcodec.h
avfilter.c Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
avfilter.h Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
avfiltergraph.c Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
avfiltergraph.h
bbox.c
bbox.h
buffer.c lavfi: move avfilter_copy_frame_props() definition from buffer.c to avcodec.c 2012-06-05 18:39:47 +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 lavfi/buffersink: typo fix in a comment. 2012-05-19 12:28:59 +02:00
buffersrc.c Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +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-06 01:08:33 +02:00
formats.h Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
gradfun.h
graphdump.c
graphparser.c
internal.h Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +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
Makefile Merge remote-tracking branch 'qatar/master' 2012-05-25 00:38:16 +02:00
sink_buffer.c sink_buffer: guard against NULL frames. 2012-05-31 17:27:27 +02:00
split.c Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +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-06 01:08:33 +02:00
transform.c
transform.h lavfi/transform: fix make checkheaders. 2012-05-18 23:34:11 +02:00
version.h lavfi: add avfilter_default_filter_name() 2012-06-04 00:54:57 +02:00
vf_aspect.c Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +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-06 01:08:33 +02:00
vf_boxblur.c Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
vf_colormatrix.c
vf_copy.c Merge remote-tracking branch 'qatar/master' 2012-05-23 21:48:31 +02:00
vf_crop.c Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
vf_cropdetect.c Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
vf_delogo.c Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
vf_deshake.c
vf_drawbox.c Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
vf_drawtext.c Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
vf_fade.c Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
vf_fieldorder.c Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +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-06 01:08:33 +02:00
vf_fps.c Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
vf_frei0r.c Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
vf_gradfun.c Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
vf_hflip.c Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
vf_hqdn3d.c Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
vf_idet.c
vf_libopencv.c Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +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-05-23 21:48:31 +02:00
vf_overlay.c Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
vf_pad.c Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
vf_pixdesctest.c Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
vf_removelogo.c
vf_scale.c Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +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-06 01:08:33 +02:00
vf_settb.c Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
vf_showinfo.c Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
vf_slicify.c Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
vf_super2xsai.c
vf_swapuv.c
vf_thumbnail.c
vf_tile.c
vf_tinterlace.c
vf_transpose.c Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
vf_unsharp.c Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
vf_vflip.c Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
vf_yadif.c Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
video.c Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
video.h Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
vsink_nullsink.c
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-06 01:08:33 +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-06 01:08:33 +02:00
yadif.h