har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavfi: check that buffer and link properties match.

Browse Source
This commit is contained in:
Nicolas George 2012-09-12 21:00:34 +02:00
parent c262ddb8c5
commit 8ad54a44eb
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavfilter/audio.c
View File

@ -225,6 +225,10 @@ int ff_filter_samples(AVFilterLink *link, AVFilterBufferRef *samplesref)
int nb_channels = av_get_channel_layout_nb_channels(link->channel_layout); int nb_channels = av_get_channel_layout_nb_channels(link->channel_layout);
int ret = 0; int ret = 0;
av_assert1(samplesref->format == link->format);
av_assert1(samplesref->audio->channel_layout == link->channel_layout);
av_assert1(samplesref->audio->sample_rate == link->sample_rate);
if (!link->min_samples || if (!link->min_samples ||
(!pbuf && (!pbuf &&
insamples >= link->min_samples && insamples <= link->max_samples)) { insamples >= link->min_samples && insamples <= link->max_samples)) {

4
libavfilter/video.c
View File

@ -249,6 +249,10 @@ int ff_start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
FF_TPRINTF_START(NULL, start_frame); ff_tlog_link(NULL, link, 0); ff_tlog(NULL, " "); ff_tlog_ref(NULL, picref, 1); FF_TPRINTF_START(NULL, start_frame); ff_tlog_link(NULL, link, 0); ff_tlog(NULL, " "); ff_tlog_ref(NULL, picref, 1);
av_assert1(picref->format == link->format);
av_assert1(picref->video->w == link->w);
av_assert1(picref->video->h == link->h);
if (link->closed) { if (link->closed) {
avfilter_unref_buffer(picref); avfilter_unref_buffer(picref);
return AVERROR_EOF; return AVERROR_EOF;