Browse Source

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

This avoids ABI issues

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.0
Michael Niedermayer 13 years ago
parent
commit
f963c77856
2 changed files with 3 additions and 3 deletions
  1. +1
    -1
      libavfilter/audio.c
  2. +2
    -2
      libavfilter/avfilter.c

+ 1
- 1
libavfilter/audio.c View File

@@ -69,7 +69,7 @@ AVFrame *ff_default_get_audio_buffer(AVFilterLink *link, int nb_samples)

frame->nb_samples = nb_samples;
frame->format = link->format;
frame->channels = link->channels;
av_frame_set_channels(frame, link->channels);
frame->channel_layout = link->channel_layout;
frame->sample_rate = link->sample_rate;



+ 2
- 2
libavfilter/avfilter.c View File

@@ -698,7 +698,7 @@ static int ff_filter_frame_needs_framing(AVFilterLink *link, AVFrame *frame)
{
int insamples = frame->nb_samples, inpos = 0, nb_samples;
AVFrame *pbuf = link->partial_buf;
int nb_channels = frame->channels;
int nb_channels = av_frame_get_channels(frame);
int ret = 0;

/* Handle framing (min_samples, max_samples) */
@@ -747,7 +747,7 @@ int ff_filter_frame(AVFilterLink *link, AVFrame *frame)
}
} else {
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->sample_rate == link->sample_rate);
}


Loading…
Cancel
Save