• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · f9a2d0c3
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    f9a2d0c3
ffmpeg.c 166 KB