From: Vittorio Giovara <[email protected]>
Signed-off-by: Vittorio Giovara <[email protected]>
Signed-off-by: James Almer <[email protected]>
---
libavformat/dv.c | 3 +--
libavformat/dvenc.c | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/libavformat/dv.c b/libavformat/dv.c
index 77a6ede37b..1dadaf6e62 100644
--- a/libavformat/dv.c
+++ b/libavformat/dv.c
@@ -281,8 +281,7 @@ static int dv_extract_audio_info(DVDemuxContext *c, const
uint8_t *frame)
c->audio_pkt[i].pos = -1;
}
c->ast[i]->codecpar->sample_rate = dv_audio_frequency[freq];
- c->ast[i]->codecpar->channels = 2;
- c->ast[i]->codecpar->channel_layout = AV_CH_LAYOUT_STEREO;
+ c->ast[i]->codecpar->ch_layout =
(AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO;
c->ast[i]->codecpar->bit_rate = 2 * dv_audio_frequency[freq] *
16;
c->ast[i]->start_time = 0;
}
diff --git a/libavformat/dvenc.c b/libavformat/dvenc.c
index b76539b59f..6e5e6c6a36 100644
--- a/libavformat/dvenc.c
+++ b/libavformat/dvenc.c
@@ -329,7 +329,7 @@ static DVMuxContext* dv_init_mux(AVFormatContext* s)
if (c->n_ast > 1) return NULL;
/* Some checks -- DV format is very picky about its incoming
streams */
if(st->codecpar->codec_id != AV_CODEC_ID_PCM_S16LE ||
- st->codecpar->channels != 2)
+ st->codecpar->ch_layout.nb_channels != 2)
goto bail_out;
if (st->codecpar->sample_rate != 48000 &&
st->codecpar->sample_rate != 44100 &&
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
[email protected]
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
[email protected] with subject "unsubscribe".
