---
avtools/avconv_opt.c | 4 ++--
avtools/avplay.c | 2 +-
avtools/avprobe.c | 2 +-
avtools/cmdutils.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/avtools/avconv_opt.c b/avtools/avconv_opt.c
index 9839a2269e..fbd64c3c1f 100644
--- a/avtools/avconv_opt.c
+++ b/avtools/avconv_opt.c
@@ -1675,8 +1675,8 @@ static int open_output_file(OptionsContext *o, const char
*filename)
for (i = 0; i < nb_input_streams; i++) {
ist = input_streams[i];
if (ist->st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO &&
- ist->st->codecpar->channels > channels) {
- channels = ist->st->codecpar->channels;
+ ist->st->codecpar->ch_layout.nb_channels > channels) {
+ channels = ist->st->codecpar->ch_layout.nb_channels;
idx = i;
}
}
diff --git a/avtools/avplay.c b/avtools/avplay.c
index 6cc63258fc..544c5dd4a1 100644
--- a/avtools/avplay.c
+++ b/avtools/avplay.c
@@ -2609,7 +2609,7 @@ static void stream_cycle_channel(PlayerState *is, int
codec_type)
switch (codec_type) {
case AVMEDIA_TYPE_AUDIO:
if (st->codecpar->sample_rate != 0 &&
- st->codecpar->channels != 0)
+ st->codecpar->ch_layout.nb_channels != 0)
goto the_end;
break;
case AVMEDIA_TYPE_VIDEO:
diff --git a/avtools/avprobe.c b/avtools/avprobe.c
index a9ca1934ca..7eab2573eb 100644
--- a/avtools/avprobe.c
+++ b/avtools/avprobe.c
@@ -756,7 +756,7 @@ static void show_stream(InputFile *ifile, InputStream *ist)
value_string(val_str, sizeof(val_str),
par->sample_rate,
unit_hertz_str));
- probe_int("channels", par->channels);
+ probe_int("channels", par->ch_layout.nb_channels);
probe_int("bits_per_sample",
av_get_bits_per_sample(par->codec_id));
break;
diff --git a/avtools/cmdutils.c b/avtools/cmdutils.c
index b0445eb85b..118ae5c0ff 100644
--- a/avtools/cmdutils.c
+++ b/avtools/cmdutils.c
@@ -1570,7 +1570,7 @@ int check_stream_specifier(AVFormatContext *s, AVStream
*st, const char *spec)
int val;
switch (par->codec_type) {
case AVMEDIA_TYPE_AUDIO:
- val = par->sample_rate && par->channels;
+ val = par->sample_rate && par->ch_layout.nb_channels;
if (par->format == AV_SAMPLE_FMT_NONE)
return 0;
break;
--
2.12.0
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
