---
avtools/avconv.c | 2 +-
avtools/avconv_filter.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/avtools/avconv.c b/avtools/avconv.c
index 755af3a3e8..9011cdf3b6 100644
--- a/avtools/avconv.c
+++ b/avtools/avconv.c
@@ -1992,7 +1992,7 @@ static int init_output_stream_encode(OutputStream *ost)
case AVMEDIA_TYPE_AUDIO:
enc_ctx->sample_fmt = ost->filter->filter->inputs[0]->format;
enc_ctx->sample_rate = ost->filter->filter->inputs[0]->sample_rate;
- enc_ctx->channel_layout =
ost->filter->filter->inputs[0]->channel_layout;
+ enc_ctx->channel_layout =
ost->filter->filter->inputs[0]->ch_layout.u.mask;
enc_ctx->channels =
av_get_channel_layout_nb_channels(enc_ctx->channel_layout);
enc_ctx->time_base = (AVRational){ 1, enc_ctx->sample_rate };
break;
diff --git a/avtools/avconv_filter.c b/avtools/avconv_filter.c
index e719c06658..7df64c647a 100644
--- a/avtools/avconv_filter.c
+++ b/avtools/avconv_filter.c
@@ -591,7 +591,7 @@ static int configure_input_audio_filter(FilterGraph *fg,
InputFilter *ifilter,
par->time_base = (AVRational){ 1, ifilter->sample_rate };
par->sample_rate = ifilter->sample_rate;
par->format = ifilter->format;
- par->channel_layout = ifilter->channel_layout;
+ av_channel_layout_from_mask(&par->ch_layout, ifilter->channel_layout);
ret = av_buffersrc_parameters_set(ifilter->filter, par);
av_freep(&par);
@@ -758,7 +758,7 @@ int configure_filtergraph(FilterGraph *fg)
ofilter->height = link->h;
ofilter->sample_rate = link->sample_rate;
- ofilter->channel_layout = link->channel_layout;
+ ofilter->channel_layout = link->ch_layout.u.mask;
}
for (i = 0; i < fg->nb_inputs; i++) {
--
2.12.0
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
