ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-20 05:16:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
61930bd0d7
FFmpeg/libavfilter
History
Michael Niedermayer 61930bd0d7 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (27 commits)
  libxvid: Give more suitable names to libxvid-related files.
  libxvid: Separate libxvid encoder from libxvid rate control code.
  jpeglsdec: Remove write-only variable in ff_jpegls_decode_lse().
  fate: cosmetics: lowercase some comments
  fate: Give more consistent names to some RealVideo/RealAudio tests.
  lavfi: add avfilter_get_audio_buffer_ref_from_arrays().
  lavfi: add extended_data to AVFilterBuffer.
  lavc: check that extended_data is properly set in avcodec_encode_audio2().
  lavc: pad last audio frame with silence when needed.
  samplefmt: add a function for filling a buffer with silence.
  samplefmt: add a function for copying audio samples.
  lavr: do not try to copy to uninitialized output audio data.
  lavr: make avresample_read() with NULL output discard samples.
  fate: split idroq audio and video into separate tests
  fate: improve dependencies
  fate: add convenient shorthands for ea-vp6, libavcodec, libavutil tests
  fate: split some combined tests into separate audio and video tests
  fate: fix dependencies for probe tests
  mips: intreadwrite: fix inline asm for gcc 4.8
  mips: intreadwrite: remove unnecessary inline asm
  ...

Conflicts:
	cmdutils.h
	configure
	doc/APIchanges
	doc/filters.texi
	ffmpeg.c
	ffplay.c
	libavcodec/internal.h
	libavcodec/jpeglsdec.c
	libavcodec/libschroedingerdec.c
	libavcodec/libxvid.c
	libavcodec/libxvid_rc.c
	libavcodec/utils.c
	libavcodec/version.h
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/buffersink.h
	tests/Makefile
	tests/fate/aac.mak
	tests/fate/audio.mak
	tests/fate/demux.mak
	tests/fate/ea.mak
	tests/fate/image.mak
	tests/fate/libavutil.mak
	tests/fate/lossless-audio.mak
	tests/fate/lossless-video.mak
	tests/fate/microsoft.mak
	tests/fate/qt.mak
	tests/fate/real.mak
	tests/fate/screen.mak
	tests/fate/video.mak
	tests/fate/voice.mak
	tests/fate/vqf.mak
	tests/ref/fate/ea-mad
	tests/ref/fate/ea-tqi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-10 02:25:41 +02:00
..
libmpcodecs lavfi: remove screenshot libmpcodecs wrapper 2012-05-02 18:15:29 +02:00
x86 Merge remote-tracking branch 'qatar/master' 2012-02-10 01:20:07 +01:00
af_aconvert.c lavfi/aconvert: use libswresample. 2012-02-02 14:31:18 +01:00
af_aformat.c lavfi/aformat: use do..while(0) form for macro. 2012-02-02 14:31:17 +01:00
af_amerge.c af_amerge: return errors from subfilters when requesting a frame 2012-04-26 18:56:35 +02:00
af_anull.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
af_aresample.c lavfi/aresample: properly propagate pts == AV_NOPTS_VALUE; 2012-04-16 01:08:00 +02:00
af_ashowinfo.c lavfi/ashowinfo: only print checksum for the existing planes 2012-02-14 18:01:57 +01:00
af_asplit.c lavfi: add asplit filter 2011-12-27 15:21:08 +01:00
af_astreamsync.c af_astreamsync: remove unused variable 2012-01-01 16:43:32 +01:00
af_earwax.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
af_pan.c af_pan: remove dual double/int storage of gain. 2012-02-22 10:50:58 +01:00
af_silencedetect.c lavfi/silencedetect: use av_ts2timestr() macro. 2012-02-15 00:22:47 +01:00
af_volume.c volume: remove duplicated condition. 2012-01-05 21:53:18 +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' 2012-05-10 02:25:41 +02:00
asink_anullsink.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
asrc_abuffer.h asrc_abuffer: deprecate the header. 2012-05-06 16:18:10 +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' 2012-05-10 02:25:41 +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-10 02:25:41 +02:00
avfilter.h Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
avfiltergraph.c avfiltergraph: fix format selection. 2012-04-24 16:35:15 +02:00
avfiltergraph.h avfiltergraph: add avfilter_graph_request_oldest(). 2012-04-23 14:13:40 +02:00
bbox.c bbox: remove superfluous initializations 2012-03-22 13:40:37 +01:00
bbox.h lavfi: add bbox filter 2012-03-17 11:21:49 +01:00
buffersink.c Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
buffersink.h Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
buffersrc.h src_buffer: update get_nb_failed_requests name. 2012-05-06 16:18:10 +02:00
defaults.c Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
drawutils.c Mark GRAY8 format as pseudo-paletted. 2012-04-09 17:21:35 +02:00
drawutils.h drawutils: implement uniform and mask blending. 2012-04-04 16:16:09 +02:00
formats.c Merge remote-tracking branch 'qatar/master' 2012-05-07 22:51:34 +02:00
gradfun.h Add some forgotten const to function arguments in libavfilter & libavformat. 2011-05-17 03:05:36 +02:00
graphdump.c graphdump: use av_bprintf API. 2012-03-21 13:39:28 +01:00
graphparser.c Merge remote-tracking branch 'qatar/master' 2012-04-17 12:13:22 +02:00
internal.h lavfi: create buffer reference in filters which need to access the ref later 2012-04-27 21:38:13 +02:00
lavfutils.c lavfi: port libmpcodecs remove-logo filter 2012-04-07 13:57:39 +02:00
lavfutils.h lavfi: port libmpcodecs remove-logo filter 2012-04-07 13:57:39 +02:00
libavfilter.v
lswsutils.c lavfi: port libmpcodecs remove-logo filter 2012-04-07 13:57:39 +02:00
lswsutils.h lavfi: port libmpcodecs remove-logo filter 2012-04-07 13:57:39 +02:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
sink_buffer.c buffersink: add AV_BUFFERSINK_FLAG_NO_REQUEST. 2012-04-23 14:13:59 +02:00
src_buffer.c src_buffer: ifdef->if CONFIG_* 2012-05-09 18:24:15 +02:00
src_movie.c lavfi/movie: add loop parameter 2012-03-18 21:19:09 +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
version.h Merge remote-tracking branch 'qatar/master' 2012-05-07 22:51:34 +02:00
vf_aspect.c lavfi/aspect: check for a negative code from av_parse_ratio() 2012-03-21 15:14:28 +01:00
vf_ass.c vf_ass: use drawutils. 2012-04-04 16:16:10 +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 lavfi: create buffer reference in filters which need to access the ref later 2012-04-27 21:38:13 +02:00
vf_boxblur.c Merge remote-tracking branch 'qatar/master' 2012-02-22 02:24:18 +01:00
vf_colormatrix.c libavfilter: add colormatrix filter 2012-04-04 23:54:53 +02:00
vf_copy.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_crop.c lavfi/crop: show input and output sample aspect ratio in the log 2012-03-17 12:34:34 +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 vf_deshake: try to fix memleak 2012-02-29 02:33:32 +01:00
vf_drawbox.c lavfi/drawbox: fix width displayed in place of x. 2012-04-13 23:15:54 +02:00
vf_drawtext.c lavfi/drawtext: give a new alias "timecode_rate" to the the r/rate option 2012-05-03 10:29:08 +02:00
vf_fade.c lavfi/fade: fix black level for non studio-level pixel formats 2012-03-31 15:55:43 +02: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 Merge remote-tracking branch 'qatar/master' 2012-01-29 00:34:59 +01:00
vf_frei0r.c vf_frei0r: set outlinks sample aspect ratio to 1 2012-03-10 17:48:14 +01:00
vf_gradfun.c Merge remote-tracking branch 'qatar/master' 2012-02-14 01:53:31 +01:00
vf_hflip.c vf_hflip: accept PIX_FMT_RGB444 and PIX_FMT_BGR444 pixel formats 2012-03-26 01:02:18 +02:00
vf_hqdn3d.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_idet.c vf_idet: clean detected frame types based on a 4 frame history. 2012-04-05 09:11:15 +02:00
vf_libopencv.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_lut.c lavfi/lut: remove unused variable 2012-05-01 01:24:48 +02:00
vf_mp.c lavfi: remove screenshot libmpcodecs wrapper 2012-05-02 18:15:29 +02:00
vf_null.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_overlay.c Merge remote-tracking branch 'qatar/master' 2012-04-10 22:53:25 +02:00
vf_pad.c Mark GRAY8 format as pseudo-paletted. 2012-04-09 17:21:35 +02:00
vf_pixdesctest.c Merge remote-tracking branch 'qatar/master' 2012-02-09 01:27:12 +01:00
vf_removelogo.c Fix a few @file doxy inconsistencies. 2012-05-04 18:50:59 +02:00
vf_scale.c Merge remote-tracking branch 'qatar/master' 2012-04-10 22:53:25 +02:00
vf_select.c Merge remote-tracking branch 'qatar/master' 2012-02-22 02:24:18 +01: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-02-22 02:24:18 +01:00
vf_settb.c Merge remote-tracking branch 'qatar/master' 2012-02-22 02:24:18 +01:00
vf_showinfo.c lavfi: create buffer reference in filters which need to access the ref later 2012-04-27 21:38:13 +02:00
vf_slicify.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_split.c Merge remote-tracking branch 'qatar/master' 2012-05-06 21:53:19 +02:00
vf_super2xsai.c lavfi: port 2xsai filter from libmpcodecs 2012-04-13 00:14:06 +02:00
vf_swapuv.c lavfi: port MP swapuv filter 2012-03-10 00:10:37 +01:00
vf_thumbnail.c vf_thumbnail: forward request_frame at least once. 2012-03-17 17:26:27 +01:00
vf_tile.c lavfi: add tile video filter. 2012-03-21 15:52:45 +01:00
vf_tinterlace.c lavfi/tinterlace: support symbolic names for the parameter 2012-04-30 23:04:46 +02:00
vf_transpose.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_unsharp.c Merge remote-tracking branch 'qatar/master' 2012-04-05 22:26:50 +02:00
vf_vflip.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_yadif.c Add yuva422p to yadif format list. 2012-05-08 10:36:47 +02:00
vsink_nullsink.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vsrc_buffer.h vsrc_buffer: deprecate the header. 2012-05-06 16:18:11 +02:00
vsrc_cellauto.c lavfi: add cellauto source 2011-12-11 11:55:33 +01:00
vsrc_color.c vsrc_color: port to new drawutils API. 2012-03-21 15:52:45 +01:00
vsrc_life.c vsrc_life: free option values. 2012-03-03 12:33:54 +01:00
vsrc_mandelbrot.c lavfi: fix mp and mandelbrot descriptions to make them complete sentences 2012-01-21 14:40:46 +01:00
vsrc_mptestsrc.c vsrx_mptestsrc: remove duplicate config_props init. 2012-03-07 00:20:23 +01:00
vsrc_testsrc.c vsrc_testsrc: free option values. 2012-03-03 13:17:39 +01:00
yadif.h Change yadif to not use out of picture lines. 2011-04-03 08:46:19 +02:00