diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2017-03-31 13:47:21 +0200 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2022-03-15 09:42:31 -0300 |
| commit | 590d9d6153209a441586c4ed9bfe1ab0d30775bc (patch) | |
| tree | e0bc4ded13fb86aea5439cf66605b79942c024a7 | |
| parent | 84f957e6b2bfa92c990c089ee43d3a42e3e5e6b7 (diff) | |
| download | ffmpeg-590d9d6153209a441586c4ed9bfe1ab0d30775bc.tar.gz | |
dv: convert to new channel layout API
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavformat/dv.c | 3 | ||||
| -rw-r--r-- | 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 e1188109c6..23b99062c7 100644 --- a/libavformat/dvenc.c +++ b/libavformat/dvenc.c @@ -333,7 +333,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 && |