This website works better with JavaScript.
Home
Help
Sign In
falkTX
/
FFmpeg
mirror of
https://github.com/falkTX/FFmpeg.git
Watch
1
Star
0
Fork
0
Code
Issues
0
Releases
338
Wiki
Activity
Browse Source
lavfi: check that buffer and link properties match.
tags/n1.0
Nicolas George
12 years ago
parent
c262ddb8c5
commit
8ad54a44eb
2 changed files
with
8 additions
and
0 deletions
Unified View
Diff Options
Show Stats
Download Patch File
Download Diff File
+4
-0
libavfilter/audio.c
+4
-0
libavfilter/video.c
+ 4
- 0
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
- 0
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;
Write
Preview
Loading…
Cancel
Save