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 015903294c Merge remote-tracking branch 'qatar/master' 
* qatar/master: (25 commits)
  rv40dsp x86: MMX/MMX2/3DNow/SSE2/SSSE3 implementations of MC
  ape: Use unsigned integer maths
  arm: dsputil: fix overreads in put/avg_pixels functions
  h264: K&R formatting cosmetics for header files (part II/II)
  h264: K&R formatting cosmetics for header files (part I/II)
  rtmp: Implement check bandwidth notification.
  rtmp: Support 'rtmp_swfurl', an option which specifies the URL of the SWF player.
  rtmp: Support 'rtmp_flashver', an option which overrides the version of the Flash plugin.
  rtmp: Support 'rtmp_tcurl', an option which overrides the URL of the target stream.
  cmdutils: Add fallback case to switch in check_stream_specifier().
  sctp: be consistent with socket option level
  configure: Add _XOPEN_SOURCE=600 to Solaris preprocessor flags.
  vcr1enc: drop pointless empty encode_init() wrapper function
  vcr1: drop pointless write-only AVCodecContext member from VCR1Context
  vcr1: group encoder code together to save #ifdefs
  vcr1: cosmetics: K&R prettyprinting, typos, parentheses, dead code, comments
  mov: make one comment slightly more specific
  lavr: replace the SSE version of ff_conv_fltp_to_flt_6ch() with SSE4 and AVX
  lavfi: move audio-related functions to a separate file.
  lavfi: remove some audio-related function from public API.
  ...

Conflicts:
	cmdutils.c
	libavcodec/h264.h
	libavcodec/h264_mvpred.h
	libavcodec/vcr1.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/defaults.c
	libavfilter/internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 		2012-05-10 23:30:42 +02:00
..
libmpcodecs lavfi: remove screenshot libmpcodecs wrapper 2012-05-02 18:15:29 +02:00
x86
…
Makefile Merge remote-tracking branch 'qatar/master' 2012-05-10 23:30:42 +02:00
af_aconvert.c Merge remote-tracking branch 'qatar/master' 2012-05-10 23:30:42 +02:00
af_aformat.c Merge remote-tracking branch 'qatar/master' 2012-05-10 23:30:42 +02:00
af_amerge.c Merge remote-tracking branch 'qatar/master' 2012-05-10 23:30:42 +02:00
af_anull.c Merge remote-tracking branch 'qatar/master' 2012-05-10 23:30:42 +02:00
af_aresample.c Merge remote-tracking branch 'qatar/master' 2012-05-10 23:30:42 +02:00
af_ashowinfo.c Merge remote-tracking branch 'qatar/master' 2012-05-10 23:30:42 +02:00
af_asplit.c Merge remote-tracking branch 'qatar/master' 2012-05-10 23:30:42 +02:00
af_astreamsync.c Merge remote-tracking branch 'qatar/master' 2012-05-10 23:30:42 +02:00
af_earwax.c Merge remote-tracking branch 'qatar/master' 2012-05-10 23:30:42 +02:00
af_pan.c Merge remote-tracking branch 'qatar/master' 2012-05-10 23:30:42 +02:00
af_silencedetect.c Merge remote-tracking branch 'qatar/master' 2012-05-10 23:30:42 +02:00
af_volume.c Merge remote-tracking branch 'qatar/master' 2012-05-10 23:30:42 +02:00
all_channel_layouts.h
…
allfilters.c Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
asink_anullsink.c
…
asrc_abuffer.h asrc_abuffer: deprecate the header. 2012-05-06 16:18:10 +02:00
asrc_aevalsrc.c Merge remote-tracking branch 'qatar/master' 2012-05-10 23:30:42 +02:00
asrc_anullsrc.c Merge remote-tracking branch 'qatar/master' 2012-05-10 23:30:42 +02:00
audio.c Merge remote-tracking branch 'qatar/master' 2012-05-10 23:30:42 +02:00
audio.h Merge remote-tracking branch 'qatar/master' 2012-05-10 23:30:42 +02: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 23:30:42 +02:00
avfilter.h Merge remote-tracking branch 'qatar/master' 2012-05-10 23:30:42 +02:00
avfiltergraph.c avfiltergraph: improve pick_format() 2012-05-10 02:25:48 +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 23:30:42 +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
…
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 Merge remote-tracking branch 'qatar/master' 2012-05-10 23:30:42 +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
sink_buffer.c buffersink: add AV_BUFFERSINK_FLAG_NO_REQUEST. 2012-04-23 14:13:59 +02:00
src_buffer.c Merge remote-tracking branch 'qatar/master' 2012-05-10 23:30:42 +02:00
src_movie.c Merge remote-tracking branch 'qatar/master' 2012-05-10 23:30:42 +02:00
transform.c
…
transform.h
…
version.h Merge remote-tracking branch 'qatar/master' 2012-05-10 23:30:42 +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
…
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
…
vf_delogo.c
…
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
…
vf_fifo.c
…
vf_format.c
…
vf_frei0r.c vf_frei0r: set outlinks sample aspect ratio to 1 2012-03-10 17:48:14 +01:00
vf_gradfun.c
…
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
…
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
…
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
…
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
…
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
…
vf_unsharp.c Merge remote-tracking branch 'qatar/master' 2012-04-05 22:26:50 +02:00
vf_vflip.c
…
vf_yadif.c Add yuva422p to yadif format list. 2012-05-08 10:36:47 +02:00
vsink_nullsink.c
…
vsrc_buffer.h vsrc_buffer: deprecate the header. 2012-05-06 16:18:11 +02:00
vsrc_cellauto.c
…
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
…
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
…