diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-12 12:59:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-12 13:02:20 +0100 |
| commit | 30ee4b3393eb1ae69c5eb8de87a5773593b3c6bb (patch) | |
| tree | 4ffadd54bd430504743bcb6893977fd977e815de /libavcodec/mpegaudiodec_template.c | |
| parent | 551a679795629ece44dc01efbb340bc59e015459 (diff) | |
| parent | 35686a289fcd2f9d7502e45002f168a753b11f9c (diff) | |
| download | ffmpeg-30ee4b3393eb1ae69c5eb8de87a5773593b3c6bb.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mp3adu: Set the channel layout properly
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegaudiodec_template.c')
| -rw-r--r-- | libavcodec/mpegaudiodec_template.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/mpegaudiodec_template.c b/libavcodec/mpegaudiodec_template.c index 1f29679d91..e0bee53207 100644 --- a/libavcodec/mpegaudiodec_template.c +++ b/libavcodec/mpegaudiodec_template.c @@ -1748,6 +1748,7 @@ static int decode_frame_adu(AVCodecContext *avctx, void *data, /* update codec info */ avctx->sample_rate = s->sample_rate; avctx->channels = s->nb_channels; + avctx->channel_layout = s->nb_channels == 1 ? AV_CH_LAYOUT_MONO : AV_CH_LAYOUT_STEREO; if (!avctx->bit_rate) avctx->bit_rate = s->bit_rate; |