diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-22 11:11:28 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-22 11:29:46 +0100 |
| commit | e39d4ff150f45d82aabafa5a34f5c9ec7a829d15 (patch) | |
| tree | 907c884f1148517e9cd97bf647bde28825d217ea /libavcodec/ac3dsp.h | |
| parent | 8ddadf56f621ddaeaa877e5739c03645ee7e57f8 (diff) | |
| parent | 43717469f9daa402f6acb48997255827a56034e9 (diff) | |
| download | ffmpeg-streaming-e39d4ff150f45d82aabafa5a34f5c9ec7a829d15.zip ffmpeg-streaming-e39d4ff150f45d82aabafa5a34f5c9ec7a829d15.tar.gz | |
Merge commit '43717469f9daa402f6acb48997255827a56034e9'
* commit '43717469f9daa402f6acb48997255827a56034e9':
ac3dsp: Reverse matrix in/out order in downmix()
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/ac3dsp.h')
| -rw-r--r-- | libavcodec/ac3dsp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/ac3dsp.h b/libavcodec/ac3dsp.h index ed98c8c..b4de307 100644 --- a/libavcodec/ac3dsp.h +++ b/libavcodec/ac3dsp.h @@ -132,10 +132,10 @@ typedef struct AC3DSPContext { void (*sum_square_butterfly_float)(float sum[4], const float *coef0, const float *coef1, int len); - void (*downmix)(float **samples, float (*matrix)[2], int out_ch, + void (*downmix)(float **samples, float **matrix, int out_ch, int in_ch, int len); - void (*downmix_fixed)(int32_t **samples, int16_t (*matrix)[2], int out_ch, + void (*downmix_fixed)(int32_t **samples, int16_t **matrix, int out_ch, int in_ch, int len); /** |
