Merge commit '30b39164256999efc8d77edc85e2e0b963c24834'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Dec 2012 01:06:50 +0000 (02:06 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Dec 2012 01:06:50 +0000 (02:06 +0100)
commita93369845783a5a63e713c143cab2c550a6ccd82
tree582b1a0ac80490ef54f09287c5613dfdb6154ca6
parentb7d8484f272b7a5a2ed9db76d5182dbd6e3e6992
parent30b39164256999efc8d77edc85e2e0b963c24834
Merge commit '30b39164256999efc8d77edc85e2e0b963c24834'

* commit '30b39164256999efc8d77edc85e2e0b963c24834':
  ac3dec: make downmix() take array of pointers to channel data

Conflicts:
libavcodec/ac3dsp.c
libavcodec/ac3dsp.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/ac3dec.c
libavcodec/ac3dec.h
libavcodec/ac3dsp.c
libavcodec/ac3dsp.h
libavcodec/x86/ac3dsp_init.c