Skip to content
Snippets Groups Projects
Commit f963c778 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

avfilter: avoid direct access to "frame"->channels


This avoids ABI issues

Signed-off-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parent 91b747ac
No related branches found
No related tags found
No related merge requests found
...@@ -69,7 +69,7 @@ AVFrame *ff_default_get_audio_buffer(AVFilterLink *link, int nb_samples) ...@@ -69,7 +69,7 @@ AVFrame *ff_default_get_audio_buffer(AVFilterLink *link, int nb_samples)
frame->nb_samples = nb_samples; frame->nb_samples = nb_samples;
frame->format = link->format; frame->format = link->format;
frame->channels = link->channels; av_frame_set_channels(frame, link->channels);
frame->channel_layout = link->channel_layout; frame->channel_layout = link->channel_layout;
frame->sample_rate = link->sample_rate; frame->sample_rate = link->sample_rate;
......
...@@ -698,7 +698,7 @@ static int ff_filter_frame_needs_framing(AVFilterLink *link, AVFrame *frame) ...@@ -698,7 +698,7 @@ static int ff_filter_frame_needs_framing(AVFilterLink *link, AVFrame *frame)
{ {
int insamples = frame->nb_samples, inpos = 0, nb_samples; int insamples = frame->nb_samples, inpos = 0, nb_samples;
AVFrame *pbuf = link->partial_buf; AVFrame *pbuf = link->partial_buf;
int nb_channels = frame->channels; int nb_channels = av_frame_get_channels(frame);
int ret = 0; int ret = 0;
/* Handle framing (min_samples, max_samples) */ /* Handle framing (min_samples, max_samples) */
...@@ -747,7 +747,7 @@ int ff_filter_frame(AVFilterLink *link, AVFrame *frame) ...@@ -747,7 +747,7 @@ int ff_filter_frame(AVFilterLink *link, AVFrame *frame)
} }
} else { } else {
av_assert1(frame->format == link->format); av_assert1(frame->format == link->format);
av_assert1(frame->channels == link->channels); av_assert1(av_frame_get_channels(frame) == link->channels);
av_assert1(frame->channel_layout == link->channel_layout); av_assert1(frame->channel_layout == link->channel_layout);
av_assert1(frame->sample_rate == link->sample_rate); av_assert1(frame->sample_rate == link->sample_rate);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment