diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-29 01:03:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-29 01:11:01 +0200 |
| commit | f9a2d0c3feccab94a86c92396f3e36110dc2227b (patch) | |
| tree | e7d0fa58e78006fd1d26dab64c74f22355bd9ce8 /libavcodec/dca.c | |
| parent | a3a5c61c6175a0bf398cce6a51fe94fcfca1145b (diff) | |
| parent | daf98908118074e96199ca7195663af4543d3808 (diff) | |
| download | ffmpeg-f9a2d0c3feccab94a86c92396f3e36110dc2227b.tar.gz | |
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>
Diffstat (limited to 'libavcodec/dca.c')
| -rw-r--r-- | libavcodec/dca.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libavcodec/dca.c b/libavcodec/dca.c index e11439f939..762821c3dc 100644 --- a/libavcodec/dca.c +++ b/libavcodec/dca.c @@ -1833,11 +1833,8 @@ static int dca_decode_frame(AVCodecContext * avctx, float* back_chan = s->samples + s->channel_order_tab[s->xch_base_channel] * 256; float* lt_chan = s->samples + s->channel_order_tab[s->xch_base_channel - 2] * 256; float* rt_chan = s->samples + s->channel_order_tab[s->xch_base_channel - 1] * 256; - int j; - for(j = 0; j < 256; ++j) { - lt_chan[j] -= back_chan[j] * M_SQRT1_2; - rt_chan[j] -= back_chan[j] * M_SQRT1_2; - } + s->dsp.vector_fmac_scalar(lt_chan, back_chan, -M_SQRT1_2, 256); + s->dsp.vector_fmac_scalar(rt_chan, back_chan, -M_SQRT1_2, 256); } if (avctx->sample_fmt == AV_SAMPLE_FMT_FLT) { |