History

Merge commit 'ac84c1ce24a285f9cf16d4297bce73b1c4a6e435'

* commit 'ac84c1ce24a285f9cf16d4297bce73b1c4a6e435': avfilter: check filter link validity Conflicts: libavfilter/avfilter.c

Michael Niedermayer committed 12 years ago

Commit 1945db12 parents 4ef02dd ac84c1c1 file · +5 −0Browse files

Showing the changes to libavfilter (1 of 1 file). Show all

Unified · Split

libavfilter/avfilter.c+5−0
@@ -227,6 +227,11 @@ int avfilter_config_links(AVFilterContext *filter) · 226 unmodified lines
227227 AVFilterLink *inlink;
228228
229229 if (!link) continue;
230+ if (!link->src || !link->dst) {
231+ av_log(filter, AV_LOG_ERROR,
232+ "Not all input and output are properly linked (%d).\n", i);
233+ return AVERROR(EINVAL);
234+ }
230235
231236 inlink = link->src->nb_inputs ? link->src->inputs[0] : NULL;
232237 link->current_pts = AV_NOPTS_VALUE;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t