mirror of https://git.ffmpeg.org/ffmpeg.git
f9a2d0c3fe
* qatar/master: (23 commits) avconv: Reformat s16 volume adjustment. ARM: NEON optimised vector_fmac_scalar() dca: use vector_fmac_scalar from dsputil dsputil: add vector_fmac_scalar() latmenc: Fix private options vf_unsharp: store hsub/vsub in the filter context vf_unsharp: adopt a more natural order of params in apply_unsharp() vf_unsharp: rename method "unsharpen" to "apply_unsharp" vf_scale: apply the same transform to the aspect during init that is applied per frame vf_pad: fix "vsub" variable value computation vf_scale: add a "sar" variable lavfi: fix realloc size computation in avfilter_add_format() vsrc_color: use internal timebase lavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config() graphparser: prefer void * over AVClass * for log contexts avfiltergraph: use meaningful error codes avconv: Initialize return value for codec copy path. fate: use 'run' helper for seek-test fate: remove seek-mpeg2reuse test Fix memory (re)allocation in matroskadec.c, related to MSVR-11-0080. ... Conflicts: doc/filters.texi libavfilter/avfilter.h libavfilter/avfiltergraph.c libavfilter/avfiltergraph.h libavfilter/graphparser.c libavfilter/vf_scale.c libavfilter/vsrc_color.c Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
|---|---|---|
| .. | ||
| libmpcodecs | ||
| x86 | ||
| Makefile | ||
| af_aconvert.c | ||
| af_aconvert_rematrix.c | ||
| af_aformat.c | ||
| af_anull.c | ||
| af_aresample.c | ||
| af_ashowinfo.c | ||
| all_channel_layouts.h | ||
| allfilters.c | ||
| asink_anullsink.c | ||
| asrc_abuffer.c | ||
| asrc_abuffer.h | ||
| asrc_anullsrc.c | ||
| avcodec.c | ||
| avcodec.h | ||
| avfilter.c | ||
| avfilter.h | ||
| avfiltergraph.c | ||
| avfiltergraph.h | ||
| buffersink.h | ||
| defaults.c | ||
| drawutils.c | ||
| drawutils.h | ||
| formats.c | ||
| gradfun.h | ||
| graphparser.c | ||
| internal.h | ||
| libavfilter.v | ||
| sink_buffer.c | ||
| src_movie.c | ||
| vf_aspect.c | ||
| vf_blackframe.c | ||
| vf_boxblur.c | ||
| vf_copy.c | ||
| vf_crop.c | ||
| vf_cropdetect.c | ||
| vf_delogo.c | ||
| vf_drawbox.c | ||
| vf_drawtext.c | ||
| vf_fade.c | ||
| vf_fieldorder.c | ||
| vf_fifo.c | ||
| vf_format.c | ||
| vf_frei0r.c | ||
| vf_gradfun.c | ||
| vf_hflip.c | ||
| vf_hqdn3d.c | ||
| vf_libopencv.c | ||
| vf_lut.c | ||
| vf_mp.c | ||
| vf_null.c | ||
| vf_overlay.c | ||
| vf_pad.c | ||
| vf_pixdesctest.c | ||
| vf_scale.c | ||
| vf_select.c | ||
| vf_setpts.c | ||
| vf_settb.c | ||
| vf_showinfo.c | ||
| vf_slicify.c | ||
| vf_split.c | ||
| vf_transpose.c | ||
| vf_unsharp.c | ||
| vf_vflip.c | ||
| vf_yadif.c | ||
| vsink_nullsink.c | ||
| vsrc_buffer.c | ||
| vsrc_buffer.h | ||
| vsrc_color.c | ||
| vsrc_mptestsrc.c | ||
| vsrc_nullsrc.c | ||
| vsrc_testsrc.c | ||
| yadif.h | ||