From fb722bab3e152f7402a4e466bcdee4aa61dd7f75 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Tue, 7 May 2013 07:20:32 +0200 Subject: [PATCH] shorten: convert to new channel layout API Signed-off-by: James Almer --- libavcodec/shorten.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c index fde5c4b982..6cce675c9f 100644 --- a/libavcodec/shorten.c +++ b/libavcodec/shorten.c @@ -428,7 +428,11 @@ static int read_header(ShortenContext *s) s->channels = 0; return AVERROR_INVALIDDATA; } - s->avctx->channels = s->channels; + if (s->avctx->ch_layout.nb_channels != s->channels) { + av_channel_layout_uninit(&s->avctx->ch_layout); + s->avctx->ch_layout.nb_channels = s->channels; + s->avctx->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + } /* get blocksize if version > 0 */ if (s->version > 0) {