Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 28 Sep 2011 23:03:02 +0000 (01:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 28 Sep 2011 23:11:01 +0000 (01:11 +0200)
commitf9a2d0c3feccab94a86c92396f3e36110dc2227b
treee7d0fa58e78006fd1d26dab64c74f22355bd9ce8
parenta3a5c61c6175a0bf398cce6a51fe94fcfca1145b
parentdaf98908118074e96199ca7195663af4543d3808
Merge remote-tracking branch 'qatar/master'

* 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>
13 files changed:
avconv.c
doc/filters.texi
ffmpeg.c
libavcodec/arm/dsputil_init_neon.c
libavcodec/arm/dsputil_neon.S
libavcodec/dca.c
libavcodec/dsputil.c
libavcodec/dsputil.h
libavfilter/avfilter.h
libavfilter/avfiltergraph.h
libavformat/latmenc.c
libavformat/matroskadec.c
tests/fate-run.sh