diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-08-30 23:22:29 +0200 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-09-12 18:51:18 +0200 |
| commit | 2c0317419bc8c7f28496d5181d951bbe8837071f (patch) | |
| tree | 298c7e36f9de0f5c212a50b0dfac09d92be30087 /libavfilter/avfilter.c | |
| parent | 47886e3644f94edb7bb78500da72975a9d7d2458 (diff) | |
| download | ffmpeg-2c0317419bc8c7f28496d5181d951bbe8837071f.tar.gz | |
lavfi: simplify signature for avfilter_get_audio_buffer() and friends
The additional parameters were never used and are complicating the
function interface. Also, they were inconsistent with the way the
video API works.
So this assumes that a requested samples buffer will have *always* the
format specified in the requested link.
This breaks audio filtering API and ABI.
Diffstat (limited to 'libavfilter/avfilter.c')
| -rw-r--r-- | libavfilter/avfilter.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index d73698681e..348015086b 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -447,17 +447,16 @@ fail: return NULL; } -AVFilterBufferRef *avfilter_get_audio_buffer(AVFilterLink *link, int perms, - enum AVSampleFormat sample_fmt, int nb_samples, - int64_t channel_layout, int planar) +AVFilterBufferRef *avfilter_get_audio_buffer(AVFilterLink *link, + int perms, int nb_samples) { AVFilterBufferRef *ret = NULL; if (link->dstpad->get_audio_buffer) - ret = link->dstpad->get_audio_buffer(link, perms, sample_fmt, nb_samples, channel_layout, planar); + ret = link->dstpad->get_audio_buffer(link, perms, nb_samples); if (!ret) - ret = avfilter_default_get_audio_buffer(link, perms, sample_fmt, nb_samples, channel_layout, planar); + ret = avfilter_default_get_audio_buffer(link, perms, nb_samples); if (ret) ret->type = AVMEDIA_TYPE_AUDIO; @@ -664,10 +663,7 @@ void avfilter_filter_samples(AVFilterLink *link, AVFilterBufferRef *samplesref) samplesref->perms, link->dstpad->min_perms, link->dstpad->rej_perms); link->cur_buf = avfilter_default_get_audio_buffer(link, dst->min_perms, - samplesref->format, - samplesref->audio->nb_samples, - samplesref->audio->channel_layout, - samplesref->audio->planar); + samplesref->audio->nb_samples); link->cur_buf->pts = samplesref->pts; link->cur_buf->audio->sample_rate = samplesref->audio->sample_rate; |