mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-02-27 01:01:07 +00:00
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> |
||
|---|---|---|
| .. | ||
| aac.h | ||
| ac3dsp_arm.S | ||
| ac3dsp_armv6.S | ||
| ac3dsp_init_arm.c | ||
| ac3dsp_neon.S | ||
| asm-offsets.h | ||
| asm.S | ||
| dcadsp_init_arm.c | ||
| dcadsp_neon.S | ||
| dsputil_arm.h | ||
| dsputil_arm.S | ||
| dsputil_armv6.S | ||
| dsputil_init_arm.c | ||
| dsputil_init_armv5te.c | ||
| dsputil_init_armv6.c | ||
| dsputil_init_neon.c | ||
| dsputil_init_vfp.c | ||
| dsputil_iwmmxt_rnd_template.c | ||
| dsputil_iwmmxt.c | ||
| dsputil_neon.S | ||
| dsputil_vfp.S | ||
| fft_fixed_init_arm.c | ||
| fft_fixed_neon.S | ||
| fft_init_arm.c | ||
| fft_neon.S | ||
| fmtconvert_init_arm.c | ||
| fmtconvert_neon.S | ||
| fmtconvert_vfp.S | ||
| h264dsp_init_arm.c | ||
| h264dsp_neon.S | ||
| h264idct_neon.S | ||
| h264pred_init_arm.c | ||
| h264pred_neon.S | ||
| int_neon.S | ||
| jrevdct_arm.S | ||
| Makefile | ||
| mathops.h | ||
| mdct_fixed_neon.S | ||
| mdct_neon.S | ||
| mpegaudiodsp_fixed_armv6.S | ||
| mpegaudiodsp_init_arm.c | ||
| mpegvideo_arm.c | ||
| mpegvideo_arm.h | ||
| mpegvideo_armv5te_s.S | ||
| mpegvideo_armv5te.c | ||
| mpegvideo_iwmmxt.c | ||
| mpegvideo_neon.S | ||
| rdft_neon.S | ||
| simple_idct_arm.S | ||
| simple_idct_armv5te.S | ||
| simple_idct_armv6.S | ||
| simple_idct_neon.S | ||
| synth_filter_neon.S | ||
| vp3dsp_neon.S | ||
| vp8_armv6.S | ||
| vp8.h | ||
| vp8dsp_init_arm.c | ||
| vp8dsp_neon.S | ||
| vp56_arith.h | ||
| vp56dsp_init_arm.c | ||
| vp56dsp_neon.S | ||