diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-18 09:02:15 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-18 09:02:15 +0200 |
| commit | 9dc30d08114068ccfe65e89c3c46deee3e6a2289 (patch) | |
| tree | 6fab06ee98b64e11d506dde9a5000f716d3cb631 /libavcodec/libfdk-aacdec.c | |
| parent | fdca9350139bae44623b90a7db4d8116c3487372 (diff) | |
| parent | 87de6ddb7b7674e329d5c96677bd8685bc7f7855 (diff) | |
| download | ffmpeg-streaming-9dc30d08114068ccfe65e89c3c46deee3e6a2289.zip ffmpeg-streaming-9dc30d08114068ccfe65e89c3c46deee3e6a2289.tar.gz | |
Merge commit '87de6ddb7b7674e329d5c96677bd8685bc7f7855'
* commit '87de6ddb7b7674e329d5c96677bd8685bc7f7855':
libfdk-aacdec: Bump the max number of channels to 8
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/libfdk-aacdec.c')
| -rw-r--r-- | libavcodec/libfdk-aacdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/libfdk-aacdec.c b/libavcodec/libfdk-aacdec.c index 2488199..43273ff 100644 --- a/libavcodec/libfdk-aacdec.c +++ b/libavcodec/libfdk-aacdec.c @@ -54,7 +54,7 @@ typedef struct FDKAACDecContext { #define DMX_ANC_BUFFSIZE 128 -#define DECODER_MAX_CHANNELS 6 +#define DECODER_MAX_CHANNELS 8 #define DECODER_BUFFSIZE 2048 * sizeof(INT_PCM) #define OFFSET(x) offsetof(FDKAACDecContext, x) |
