virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity
d0ad91c258
FFmpeg/libavfilter
History
Michael Niedermayer d0ad91c258 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  os_support: Define SHUT_RD, SHUT_WR and SHUT_RDWR on OS/2
  http: Add support for reading http POST reply headers
  http: Add http_shutdown() for ending writing of posts
  tcp: Allow signalling end of reading/writing
  avio: Add a function for signalling end of reading/writing
  lavfi: fix comment, audio is supported now.
  lavfi: fix incorrect comment.
  lavfi: remove avfilter_null_* from public API on next bump.
  lavfi: remove avfilter_default_* from public API on next bump.
  lavfi: deprecate default config_props() callback and refactor avfilter_config_links()
  avfiltergraph: smarter sample format selection.
  avconv: rename transcode_audio/video to decode_audio/video.
  asyncts: reset delta to 0 when it's not used.
  x86: lavc: use %if HAVE_AVX guards around AVX functions in yasm code.
  dwt: return errors from ff_slice_buffer_init()

Conflicts:
	ffmpeg.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/formats.c
	libavfilter/version.h
	libavfilter/vf_blackframe.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c
	libavfilter/vf_format.c
	libavfilter/vf_showinfo.c
	libavfilter/video.c
	libavfilter/video.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-23 21:48:31 +02:00
..
libmpcodecs lavfi: remove screenshot libmpcodecs wrapper 2012-05-02 18:15:29 +02:00
x86
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-05-16 02:27:31 +02:00
af_amerge.c af_amerge: compute output timestamp. 2012-05-23 14:56:51 +02:00
af_anull.c Merge remote-tracking branch 'qatar/master' 2012-05-10 23:30:42 +02:00
af_aresample.c af_aresample: use new swr API to pass and compensate PTS 2012-05-19 19:23:38 +02:00
af_ashowinfo.c lavfi: drop planar/packed negotiation support 2012-05-16 13:16:05 +02:00
af_astreamsync.c lavfi: drop planar/packed negotiation support 2012-05-16 13:16:05 +02:00
af_asyncts.c asyncts: reset delta to 0 when it's not used. 2012-05-22 21:28:20 +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 af_resample: remove an extra space in the log output 2012-05-21 18:26:51 -04:00
af_silencedetect.c lavfi: drop planar/packed negotiation support 2012-05-16 13:16:05 +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 lavfi: add an audio split filter 2012-05-21 14:49:52 -04:00
asink_anullsink.c
asrc_abuffer.h asrc_abuffer: deprecate the header. 2012-05-06 16:18:10 +02:00
asrc_aevalsrc.c lavfi/aevalsrc: reindent after the previous commit 2012-05-18 00:59:42 +02:00
asrc_anullsrc.c lavfi: remove audio.h include from avfilter.h. 2012-05-12 17:59:41 +02:00
audio.c Merge commit '755cd4197d53946208e042f095b930dca18d9430' 2012-05-19 20:31:24 +02:00
audio.h lavfi: drop planar/packed negotiation support 2012-05-16 13:16:05 +02:00
avcodec.c Merge remote-tracking branch 'qatar/master' 2012-05-16 02:27:31 +02:00
avcodec.h Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
avfilter.c Merge remote-tracking branch 'qatar/master' 2012-05-23 21:48:31 +02:00
avfilter.h Merge remote-tracking branch 'qatar/master' 2012-05-23 21:48:31 +02:00
avfiltergraph.c Merge remote-tracking branch 'qatar/master' 2012-05-23 21:48:31 +02:00
avfiltergraph.h lavfi: add avfilter_graph_set_auto_convert(). 2012-05-14 21:29:58 +02:00
bbox.c
bbox.h
buffer.c Merge remote-tracking branch 'qatar/master' 2012-05-16 02:27:31 +02:00
buffersink.c Merge remote-tracking branch 'qatar/master' 2012-05-16 02:27:31 +02:00
buffersink.h lavfi/buffersink: typo fix in a comment. 2012-05-19 12:28:59 +02:00
buffersrc.c buffersrc: cosmetic: reindent. 2012-05-20 15:41:58 +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.h
formats.c Merge remote-tracking branch 'qatar/master' 2012-05-23 21:48:31 +02:00
formats.h Merge remote-tracking branch 'qatar/master' 2012-05-23 21:48:31 +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-04-17 12:13:22 +02:00
internal.h libavfilter: add ff_parse_time_base() 2012-05-17 02:55:57 +02:00
lavfutils.c lavfutils: ff_load_image: Initialize context 2012-05-11 15:07:26 +02:00
lavfutils.h
libavfilter.v
lswsutils.c
lswsutils.h
Makefile Merge remote-tracking branch 'qatar/master' 2012-05-22 23:42:17 +02:00
sink_buffer.c lavfi: drop planar/packed negotiation support 2012-05-16 13:16:05 +02:00
split.c Merge remote-tracking branch 'qatar/master' 2012-05-23 21:48:31 +02:00
src_buffer.c lavfi: unify src_buffer and buffersrc. 2012-05-19 10:59:52 +02:00
src_movie.c lavfi: drop planar/packed negotiation support 2012-05-16 13:16:05 +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-05-23 21:48:31 +02:00
vf_aspect.c Merge remote-tracking branch 'qatar/master' 2012-05-23 21:48:31 +02:00
vf_ass.c vf_ass: use AV_OPT_TYPE_IMAGE_SIZE. 2012-05-20 18:24:20 +02:00
vf_bbox.c lavfi: create buffer reference in filters which need to access the ref later 2012-04-27 21:38:13 +02:00
vf_blackdetect.c lavfi: create buffer reference in filters which need to access the ref later 2012-04-27 21:38:13 +02:00
vf_blackframe.c Merge remote-tracking branch 'qatar/master' 2012-05-23 21:48:31 +02:00
vf_boxblur.c
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-05-23 21:48:31 +02:00
vf_cropdetect.c Merge remote-tracking branch 'qatar/master' 2012-05-23 21:48:31 +02:00
vf_delogo.c Merge remote-tracking branch 'qatar/master' 2012-05-23 21:48:31 +02:00
vf_deshake.c
vf_drawbox.c Merge remote-tracking branch 'qatar/master' 2012-05-23 21:48:31 +02:00
vf_drawtext.c Merge remote-tracking branch 'qatar/master' 2012-05-23 21:48:31 +02:00
vf_fade.c Merge remote-tracking branch 'qatar/master' 2012-05-23 21:48:31 +02:00
vf_fieldorder.c
vf_fifo.c Merge remote-tracking branch 'qatar/master' 2012-05-23 21:48:31 +02:00
vf_format.c Merge remote-tracking branch 'qatar/master' 2012-05-23 21:48:31 +02:00
vf_fps.c lavfi: Add fps filter. 2012-05-18 19:33:54 +02:00
vf_frei0r.c
vf_gradfun.c
vf_hflip.c
vf_hqdn3d.c
vf_idet.c vf_idet: remove unused variables 2012-05-10 20:07:23 +02:00
vf_libopencv.c
vf_lut.c vf_lut: fix pointer type (const) warning 2012-05-10 20:09:37 +02:00
vf_mp.c lavfi: remove screenshot libmpcodecs wrapper 2012-05-02 18:15:29 +02:00
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-04-10 22:53:25 +02:00
vf_pad.c
vf_pixdesctest.c
vf_removelogo.c Fix a few @file doxy inconsistencies. 2012-05-04 18:50:59 +02:00
vf_scale.c vf_scale: support dynamically changing input parameters. 2012-05-20 16:39:03 +02:00
vf_select.c Merge remote-tracking branch 'qatar/master' 2012-05-23 21:48:31 +02:00
vf_setfield.c lavfi/setfield: remove stray argument in av_log() 2012-04-21 12:32:50 +02:00
vf_setpts.c Merge remote-tracking branch 'qatar/master' 2012-05-23 21:48:31 +02:00
vf_settb.c Merge remote-tracking branch 'qatar/master' 2012-05-23 21:48:31 +02:00
vf_showinfo.c Merge remote-tracking branch 'qatar/master' 2012-05-23 21:48:31 +02:00
vf_slicify.c Merge remote-tracking branch 'qatar/master' 2012-05-23 21:48:31 +02:00
vf_super2xsai.c lavfi: port 2xsai filter from libmpcodecs 2012-04-13 00:14:06 +02:00
vf_swapuv.c
vf_thumbnail.c
vf_tile.c
vf_tinterlace.c lavfi/tinterlace: support symbolic names for the parameter 2012-04-30 23:04:46 +02:00
vf_transpose.c
vf_unsharp.c
vf_vflip.c Merge remote-tracking branch 'qatar/master' 2012-05-23 21:48:31 +02:00
vf_yadif.c Merge remote-tracking branch 'qatar/master' 2012-05-23 21:48:31 +02:00
video.c Merge remote-tracking branch 'qatar/master' 2012-05-23 21:48:31 +02:00
video.h Merge remote-tracking branch 'qatar/master' 2012-05-23 21:48:31 +02:00
vsink_nullsink.c
vsrc_buffer.h buffersrc: add av_buffersrc_write_frame(). 2012-05-14 21:36:11 +02:00
vsrc_cellauto.c vsrc_cellauto: use AV_OPT_TYPE_IMAGE_SIZE. 2012-05-20 18:24:20 +02:00
vsrc_color.c
vsrc_life.c vsrc_life: use AV_OPT_TYPE_IMAGE_SIZE. 2012-05-20 18:24:20 +02:00
vsrc_mandelbrot.c vsrc_mandelbrot: use AV_OPT_TYPE_IMAGE_SIZE. 2012-05-20 18:24:20 +02:00
vsrc_mptestsrc.c
vsrc_testsrc.c vsrc_testsrc: use AV_OPT_TYPE_IMAGE_SIZE. 2012-05-20 18:24:20 +02:00
yadif.h