virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

lavfi/audio: don't set cur_buf in ff_filter_samples().

Browse Source 
It's redundant, since the input buffer is passed as a parameter to the
filter_samples() callback, and can lead to stale pointers remaining on
the link.
This commit is contained in:
Anton Khirnov
2012-06-17 10:21:49 +02:00
parent 4a97ff2fa7
commit e026c9b390
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libavfilter/audio.c
View File

@@ -176,6 +176,7 @@ void ff_filter_samples(AVFilterLink *link, AVFilterBufferRef *samplesref)
{ {
void (*filter_samples)(AVFilterLink *, AVFilterBufferRef *); void (*filter_samples)(AVFilterLink *, AVFilterBufferRef *);
AVFilterPad *dst = link->dstpad; AVFilterPad *dst = link->dstpad;
AVFilterBufferRef *buf_out;
FF_DPRINTF_START(NULL, filter_samples); ff_dlog_link(NULL, link, 1); FF_DPRINTF_START(NULL, filter_samples); ff_dlog_link(NULL, link, 1);
@@ -189,21 +190,21 @@ void ff_filter_samples(AVFilterLink *link, AVFilterBufferRef *samplesref)
"Copying audio data in avfilter (have perms %x, need %x, reject %x)\n", "Copying audio data in avfilter (have perms %x, need %x, reject %x)\n",
samplesref->perms, link->dstpad->min_perms, link->dstpad->rej_perms); samplesref->perms, link->dstpad->min_perms, link->dstpad->rej_perms);
link->cur_buf = ff_default_get_audio_buffer(link, dst->min_perms, buf_out = ff_default_get_audio_buffer(link, dst->min_perms,
samplesref->audio->nb_samples); samplesref->audio->nb_samples);
link->cur_buf->pts = samplesref->pts; buf_out->pts = samplesref->pts;
link->cur_buf->audio->sample_rate = samplesref->audio->sample_rate; buf_out->audio->sample_rate = samplesref->audio->sample_rate;
/* Copy actual data into new samples buffer */ /* Copy actual data into new samples buffer */
av_samples_copy(link->cur_buf->extended_data, samplesref->extended_data, av_samples_copy(buf_out->extended_data, samplesref->extended_data,
0, 0, samplesref->audio->nb_samples, 0, 0, samplesref->audio->nb_samples,
av_get_channel_layout_nb_channels(link->channel_layout), av_get_channel_layout_nb_channels(link->channel_layout),
link->format); link->format);
avfilter_unref_buffer(samplesref); avfilter_unref_buffer(samplesref);
} else } else
link->cur_buf = samplesref; buf_out = samplesref;
filter_samples(link, link->cur_buf); filter_samples(link, buf_out);
} }