diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-09-06 01:13:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-09-06 12:36:28 +0200 |
| commit | fdd9663781e3ebc8ebed0704607abd174095a905 (patch) | |
| tree | 2e1d0673f2095324f11b7f9749e09e3270e90ad9 /libavfilter/fifo.c | |
| parent | db3b93319dc806fa437215c9224d945e81083593 (diff) | |
| download | ffmpeg-fdd9663781e3ebc8ebed0704607abd174095a905.tar.gz | |
avfilter/fifo: Make independent of the channel layout
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavfilter/fifo.c')
| -rw-r--r-- | libavfilter/fifo.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavfilter/fifo.c b/libavfilter/fifo.c index f0b77ffb34..abfbba10bb 100644 --- a/libavfilter/fifo.c +++ b/libavfilter/fifo.c @@ -104,7 +104,7 @@ static void queue_pop(FifoContext *s) static void buffer_offset(AVFilterLink *link, AVFrame *frame, int offset) { - int nb_channels = av_get_channel_layout_nb_channels(link->channel_layout); + int nb_channels = link->channels; int planar = av_sample_fmt_is_planar(link->format); int planes = planar ? nb_channels : 1; int block_align = av_get_bytes_per_sample(link->format) * (planar ? 1 : nb_channels); @@ -129,7 +129,7 @@ static void buffer_offset(AVFilterLink *link, AVFrame *frame, static int calc_ptr_alignment(AVFrame *frame) { int planes = av_sample_fmt_is_planar(frame->format) ? - av_get_channel_layout_nb_channels(frame->channel_layout) : 1; + av_frame_get_channels(frame) : 1; int min_align = 128; int p; @@ -170,7 +170,7 @@ static int return_audio_frame(AVFilterContext *ctx) buffer_offset(link, head, link->request_samples); } } else { - int nb_channels = av_get_channel_layout_nb_channels(link->channel_layout); + int nb_channels = link->channels; if (!s->out) { s->out = ff_get_audio_buffer(link, link->request_samples); |