diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-12 12:18:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-12 12:18:58 +0100 |
| commit | 4d60e5051e66c6e79645efec1376b98caf41ad03 (patch) | |
| tree | cd3cac5dce89799a1f1f0254ba33f73ff35167d0 /libavcodec/binkaudio.c | |
| parent | 8c0a14d221af1add009829d65a5beb0e5d5d8770 (diff) | |
| parent | faf340f60c18c0af282570eed156ec67c1d98f6f (diff) | |
| download | ffmpeg-4d60e5051e66c6e79645efec1376b98caf41ad03.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
binkaudio: set channel layout
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/binkaudio.c')
| -rw-r--r-- | libavcodec/binkaudio.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c index 000895b9e3..a1a91ebfb0 100644 --- a/libavcodec/binkaudio.c +++ b/libavcodec/binkaudio.c @@ -28,6 +28,7 @@ * http://wiki.multimedia.cx/index.php?title=Bink_Audio */ +#include "libavutil/channel_layout.h" #include "avcodec.h" #define BITSTREAM_READER_LE #include "get_bits.h" @@ -87,6 +88,8 @@ static av_cold int decode_init(AVCodecContext *avctx) av_log(avctx, AV_LOG_ERROR, "invalid number of channels: %d\n", avctx->channels); return AVERROR_INVALIDDATA; } + avctx->channel_layout = avctx->channels == 1 ? AV_CH_LAYOUT_MONO : + AV_CH_LAYOUT_STEREO; s->version_b = avctx->extradata_size >= 4 && avctx->extradata[3] == 'b'; |