1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
FFmpeg/libavfilter
Michael Niedermayer 484e59a0a0 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  avs: call release_buffer() at the end.
  Add minor bumps and APIchanges entries for lavc/lavfi changes.
  mpegvideo.c: K&R formatting and cosmetics.
  avconv: avoid memcpy in vsrc_buffer when possible.
  avconv: implement get_buffer()/release_buffer().
  lavfi: add a new function av_buffersrc_buffer().
  lavfi: add avfilter_copy_frame_props()
  lavc: add format field to AVFrame
  lavc: add width and height fields to AVFrame
  lavc: add a sample_aspect_ratio field to AVFrame
  doxy: add website-alike style to the html output
  FAQ: add an entry for common error when using -profile

Conflicts:
	avconv.c
	cmdutils.c
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/mpegvideo.c
	libavcodec/utils.c
	libavcodec/version.h
	libavfilter/Makefile
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/src_movie.c
	libavfilter/vsrc_buffer.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-26 04:10:47 +01:00
..
libmpcodecs Replace all strcasecmp/strncasecmp usages. 2011-11-03 19:25:26 +01:00
x86 Merge remote-tracking branch 'qatar/master' 2011-07-05 02:26:17 +02:00
af_aconvert_rematrix.c lavfi: add audio convert filter 2011-09-16 20:44:27 +02:00
af_aconvert.c Merge remote-tracking branch 'qatar/master' 2011-11-24 03:32:24 +01:00
af_aformat.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
af_anull.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
af_aresample.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
af_ashowinfo.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
af_earwax.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
af_pan.c lavfi: reimplement MPlayer's af_pan filter for libavfilter. 2011-11-18 19:39:26 +01:00
af_volume.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
all_channel_layouts.h lavfi: add avfilter_all_channel_layouts public symbol 2011-09-16 00:46:41 +02:00
allfilters.c Merge remote-tracking branch 'qatar/master' 2011-12-24 00:45:02 +01:00
asink_anullsink.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
asrc_abuffer.c Merge remote-tracking branch 'qatar/master' 2011-11-24 03:32:24 +01:00
asrc_abuffer.h lavfi: add asrc_abuffer - audio buffer source 2011-08-21 11:37:57 +02:00
asrc_aevalsrc.c aevalsrc: add duration option 2011-12-04 21:13:22 +01:00
asrc_anullsrc.c Merge remote-tracking branch 'qatar/master' 2011-11-26 01:12:08 +01:00
avcodec.c Merge remote-tracking branch 'qatar/master' 2011-12-26 04:10:47 +01:00
avcodec.h Merge remote-tracking branch 'qatar/master' 2011-12-26 04:10:47 +01:00
avfilter.c lavfi: add avfilter_copy_frame_props() 2011-12-25 16:18:57 +01:00
avfilter.h Merge remote-tracking branch 'qatar/master' 2011-12-26 04:10:47 +01:00
avfiltergraph.c lavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config() 2011-09-28 08:02:53 +02:00
avfiltergraph.h graphparser: Fix doxy on avfilter_graph_parse() return value. 2011-11-22 15:09:26 +01:00
buffersink.h buffersink: Implement a poll function. 2011-12-08 21:19:23 +01:00
buffersrc.h lavfi: add a new function av_buffersrc_buffer(). 2011-12-25 16:18:57 +01:00
defaults.c avfilter: align allocated images to 32 for AVX and IFF 2011-11-30 18:53:47 +01:00
drawutils.c lavfi: add internal function ff_fill_rgba_map() 2011-10-28 02:06:50 +02:00
drawutils.h lavfi: add internal function ff_fill_rgba_map() 2011-10-28 02:06:50 +02:00
formats.c sink_buffer: copy list of provided formats in the context 2011-12-22 10:09:42 +01:00
gradfun.h Add some forgotten const to function arguments in libavfilter & libavformat. 2011-05-17 03:05:36 +02:00
graphparser.c lavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config() 2011-09-28 08:02:53 +02:00
internal.h sink_buffer: copy list of provided formats in the context 2011-12-22 10:09:42 +01:00
libavfilter.v
Makefile lavfi: add a new function av_buffersrc_buffer(). 2011-12-25 16:18:57 +01:00
sink_buffer.c sink_buffer: copy list of provided formats in the context 2011-12-22 10:09:42 +01:00
src_movie.c Merge remote-tracking branch 'qatar/master' 2011-12-26 04:10:47 +01:00
transform.c cleanup: for(int 2011-12-13 21:08:43 +01:00
transform.h lavfi: add missing header mulitple-inclusion guard in transform.h 2011-10-20 15:59:20 +02:00
vf_aspect.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_ass.c lavfi: add libass based subtitles renderer 2011-11-26 10:42:33 +01:00
vf_blackframe.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_boxblur.c vf_boxblur: fix memleak 2011-11-25 04:45:41 +01:00
vf_copy.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_crop.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_cropdetect.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_delogo.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_deshake.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_drawbox.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_drawtext.c vf_drawtext: select YUV color for drawbox() in case YUV colorspace is used 2011-12-24 16:21:40 +01:00
vf_fade.c vf_fade: reindent after previous commit 2011-11-10 01:31:28 +01:00
vf_fieldorder.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_fifo.c Fix various if parenthesis misplacements. 2011-11-21 19:35:33 +01:00
vf_format.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_frei0r.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_gradfun.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_hflip.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_hqdn3d.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_libopencv.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_lut.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_mp.c vf_mp: rewrite vf_mp filter warning message 2011-11-23 13:22:46 +01:00
vf_null.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_overlay.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_pad.c pad: fix format string length 2011-11-14 05:42:10 +01:00
vf_pixdesctest.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_scale.c vf_scale: give a clue in case of invalid expression self-reference 2011-12-06 15:03:51 +01:00
vf_select.c cleanup: remove various double end ';' all over the code. 2011-11-16 07:48:23 +01:00
vf_setpts.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_settb.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_showinfo.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_slicify.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_split.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_transpose.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_unsharp.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_vflip.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_yadif.c Merge remote-tracking branch 'qatar/master' 2011-12-13 23:21:37 +01:00
vsink_nullsink.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vsrc_buffer.c Merge remote-tracking branch 'qatar/master' 2011-12-26 04:10:47 +01:00
vsrc_buffer.h vsrc_buffer: remove duplicated file description 2011-09-19 12:43:10 +02:00
vsrc_cellauto.c lavfi: add cellauto source 2011-12-11 11:55:33 +01:00
vsrc_color.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vsrc_life.c life: add mold, mold_color, life_color and death_color options. 2011-12-11 14:14:01 +01:00
vsrc_mandelbrot.c vsrc_mandelbrot: Fix vsrc_mandelbrot.c:358:85: warning: ‘epsilon’ may be used uninitialized in this function [-Wuninitialized] 2011-11-24 00:08:05 +01:00
vsrc_mptestsrc.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vsrc_testsrc.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
yadif.h Change yadif to not use out of picture lines. 2011-04-03 08:46:19 +02:00