virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
f2b20b7a8b
FFmpeg/libavfilter
History
Michael Niedermayer f2b20b7a8b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  pixdesc: mark pseudopaletted formats with a special flag.
  avconv: switch to avcodec_encode_video2().
  libx264: implement encode2().
  libx264: split extradata writing out of encode_nals().
  lavc: add avcodec_encode_video2() that encodes from an AVFrame -> AVPacket
  cmdutils: update copyright year to 2012.
  swscale: sign-extend integer function argument to qword on x86-64.
  x86inc: support yasm -f win64 flag also.
  h264: manually save/restore XMM registers for functions using INIT_MMX.
  x86inc: allow manual use of WIN64_SPILL_XMM.
  aacdec: Use correct speaker order for 7.1.
  aacdec: Remove incorrect comment.
  aacdec: Simplify output configuration.
  Remove Sun medialib glue code.
  dsputil: set STRIDE_ALIGN to 16 for x86 also.
  pngdsp: swap argument inversion.

Conflicts:
	cmdutils.c
	configure
	doc/APIchanges
	ffmpeg.c
	libavcodec/aacdec.c
	libavcodec/dsputil.h
	libavcodec/libx264.c
	libavcodec/mlib/dsputil_mlib.c
	libavcodec/utils.c
	libavfilter/vf_scale.c
	libavutil/avutil.h
	libswscale/mlib/yuv2rgb_mlib.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-09 01:27:12 +01:00
..
libmpcodecs Revert "vf_fspp: use LOCAL_MANGLE instead of MANGLE." 2012-02-08 23:16:32 +01:00
x86 Merge remote-tracking branch 'qatar/master' 2011-07-05 02:26:17 +02: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 lavfi/amerge: copy ref props after filtering samples. 2012-02-02 14:31:18 +01:00
af_anull.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
af_aresample.c lavfi/aresample: use libswresample. 2012-02-02 14:31:17 +01:00
af_ashowinfo.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +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 lavfi/pan: copy ref props after filtering samples. 2012-02-02 14:31:18 +01:00
af_silencedetect.c lavfi: add audio silencedetect filter. 2012-01-08 17:08:55 +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 lavfi: add setfield filter 2012-02-06 20:46:58 +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 avfilter: add some asserts() to check refcounts. 2012-01-22 19:30:40 +01:00
avfilter.h Merge remote-tracking branch 'qatar/master' 2012-01-13 01:29:48 +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 lavfi: add avfilter_graph_dump. 2012-01-24 11:38:36 +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 Merge remote-tracking branch 'qatar/master' 2012-01-29 00:34:59 +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 Merge remote-tracking branch 'qatar/master' 2012-01-29 00:34:59 +01:00
gradfun.h Add some forgotten const to function arguments in libavfilter & libavformat. 2011-05-17 03:05:36 +02:00
graphdump.c lavfi: add avfilter_graph_dump. 2012-01-24 11:38:36 +01:00
graphparser.c lavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config() 2011-09-28 08:02:53 +02:00
internal.h avfilter: pool draining and self destruction support. 2012-01-12 16:32:54 +01:00
libavfilter.v Add symbol versioning for shared libraries 2010-01-16 04:49:02 +00:00
Makefile lavfi: add setfield filter 2012-02-06 20:46:58 +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
version.h lavfi: add setfield filter 2012-02-06 20:46:58 +01:00
vf_aspect.c lavfi/aspect: rename field aspect->aspect to aspect->ratio 2012-02-07 15:49:01 +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 Merge remote-tracking branch 'qatar/master' 2012-02-09 01:27:12 +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 deshake: variable used uninitialized 2012-01-21 05:22:49 +01:00
vf_drawbox.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_drawtext.c Merge remote-tracking branch 'qatar/master' 2012-02-07 01:40:29 +01:00
vf_fade.c lavfi: add missing periods in descriptions. 2012-01-20 00:16:27 +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 Merge remote-tracking branch 'qatar/master' 2012-01-29 00:34:59 +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 Merge remote-tracking branch 'qatar/master' 2012-01-26 02:23:56 +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 lavfi: fix mp and mandelbrot descriptions to make them complete sentences 2012-01-21 14:40:46 +01:00
vf_null.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_overlay.c overlay: do not leak x/y expressions. 2012-01-15 09:12:03 +01:00
vf_pad.c pad: fix format string length 2011-11-14 05:42:10 +01:00
vf_pixdesctest.c Merge remote-tracking branch 'qatar/master' 2012-02-09 01:27:12 +01:00
vf_scale.c Merge remote-tracking branch 'qatar/master' 2012-02-09 01:27:12 +01:00
vf_select.c cleanup: remove various double end ';' all over the code. 2011-11-16 07:48:23 +01:00
vf_setfield.c lavfi: add setfield filter 2012-02-06 20:46:58 +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_thumbnail.c lavfi/thumbnail: rename @url to @see. 2012-02-03 00:55:37 +01:00
vf_tinterlace.c vf_tinterlace: implement interlace mode 5 2012-01-01 16:16:50 +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 lavfi: add missing periods in descriptions. 2012-01-20 00:16:27 +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' 2012-01-13 01:29:48 +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 lavfi: add missing periods in descriptions. 2012-01-20 00:16:27 +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 lavfi: fix mp and mandelbrot descriptions to make them complete sentences 2012-01-21 14:40:46 +01:00
vsrc_mptestsrc.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vsrc_testsrc.c lavfi/testsrc: add "decimals" option to the testsrc filter 2012-01-17 12:03:30 +01:00
yadif.h Change yadif to not use out of picture lines. 2011-04-03 08:46:19 +02:00