diff options
| author | James Almer <jamrial@gmail.com> | 2021-12-27 19:53:01 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2022-03-15 09:42:46 -0300 |
| commit | 53d60aafaf2649660bea6f1558dd54d50f6cf636 (patch) | |
| tree | a6a0073c5c76efa09f3512f10988a9e59a73c07f | |
| parent | 1f96db959c1235bb7079d354e09914a0a2608f62 (diff) | |
| download | ffmpeg-53d60aafaf2649660bea6f1558dd54d50f6cf636.tar.gz | |
avdevice/lavfi: remove call to deprecated function av_buffersink_get_channel_layout()
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavdevice/lavfi.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c index fdb93b835f..db5d0b94de 100644 --- a/libavdevice/lavfi.c +++ b/libavdevice/lavfi.c @@ -333,11 +333,9 @@ av_cold static int lavfi_read_header(AVFormatContext *avctx) par->sample_aspect_ratio = av_buffersink_get_sample_aspect_ratio(sink); } else if (par->codec_type == AVMEDIA_TYPE_AUDIO) { par->sample_rate = av_buffersink_get_sample_rate(sink); - ret = av_channel_layout_from_mask(&par->ch_layout, av_buffersink_get_channel_layout(sink)); - if (ret < 0) { - par->ch_layout.nb_channels = av_buffersink_get_channels(sink); - par->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; - } + ret = av_buffersink_get_ch_layout(sink, &par->ch_layout); + if (ret < 0) + goto end; par->format = av_buffersink_get_format(sink); par->codec_id = av_get_pcm_codec(par->format, -1); if (par->codec_id == AV_CODEC_ID_NONE) @@ -441,7 +439,7 @@ static int lavfi_read_packet(AVFormatContext *avctx, AVPacket *pkt) frame->format, frame->width, frame->height, 1); } else if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) { size = frame->nb_samples * av_get_bytes_per_sample(frame->format) * - frame->channels; + frame->ch_layout.nb_channels; if ((ret = av_new_packet(pkt, size)) < 0) goto fail; memcpy(pkt->data, frame->data[0], size); |