Merge commit '9d5c62ba5b586c80af508b5914934b1c439f6652'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Dec 2012 13:33:38 +0000 (14:33 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Dec 2012 13:33:38 +0000 (14:33 +0100)
commit15784c2bab56508565771cd04b5dda64d6717953
treea0eade0816e7ea46a08a4cf7ffd2b25e6666c59b
parent32aedebdc59d5b34ab7a9137855dcc602267e00f
parent9d5c62ba5b586c80af508b5914934b1c439f6652
Merge commit '9d5c62ba5b586c80af508b5914934b1c439f6652'

* commit '9d5c62ba5b586c80af508b5914934b1c439f6652':
  lavu/opt: do not filter out the initial sign character except for flags
  eval: treat dB as decibels instead of decibytes
  float_dsp: add vector_dmul_scalar() to multiply a vector of doubles

Conflicts:
libavutil/eval.c
tests/ref/fate/eval

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/eval.c
libavutil/float_dsp.c
libavutil/float_dsp.h
libavutil/opt.c
libavutil/x86/float_dsp.asm
libavutil/x86/float_dsp_init.c
libavutil/x86/x86util.asm
tests/ref/fate/eval