Merge commit '4cb6964244fd6c099383d8b7e99731e72cc844b9'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Feb 2014 20:41:19 +0000 (21:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Feb 2014 20:41:19 +0000 (21:41 +0100)
* commit '4cb6964244fd6c099383d8b7e99731e72cc844b9':
  dcadec: simplify decoding of VQ high frequencies

Conflicts:
configure
libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure
libavcodec/arm/dca.h
libavcodec/dcadec.c
libavcodec/dcadsp.c
libavcodec/dcadsp.h
libavcodec/x86/dcadsp.asm
libavcodec/x86/dcadsp_init.c

diff --cc configure
+++ b/configure
@@@ -1540,8 -1330,6 +1540,7 @@@ HAVE_LIST=
      altivec_h
      arpa_inet_h
      asm_mod_q
-     asm_mod_y
 +    asm_types_h
      atomic_cas_ptr
      atomics_native
      attribute_may_alias
Simple merge
Simple merge
Simple merge
@@@ -22,6 -22,8 +22,8 @@@
  #include "avfft.h"
  #include "synth_filter.h"
  
 -#define DCA_SUBBANDS 32
++#define DCA_SUBBANDS 64
  typedef struct DCADSPContext {
      void (*lfe_fir[2])(float *out, const float *in, const float *coefs);
      void (*qmf_32_subbands)(float samples_in[32][8], int sb_act,
Simple merge
Simple merge