highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

shorten: convert to new channel layout API

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
Anton Khirnov
2013-05-07 07:20:32 +02:00
committed by James Almer
parent b7483d02c2
commit fb722bab3e
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/shorten.c
View File

@@ -428,7 +428,11 @@ static int read_header(ShortenContext *s)
s->channels = 0; s->channels = 0;
return AVERROR_INVALIDDATA; 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 */ /* get blocksize if version > 0 */
if (s->version > 0) { if (s->version > 0) {