Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-04-12 17:13:59 +0400
committerMichael Niedermayer <michaelni@gmx.at>2013-04-12 17:14:08 +0400
commit9a91c67478cd46d8c43774f8e1876d90323432d3 (patch)
tree2286e088b3600065a4ea2a2fef9772cc8dbcd685 /libavfilter/avfilter.c
parent835cc0f2e7098fbb548d7622110c4fdc0831809d (diff)
parentf160c6a18a574b4c7d063e0a748037cbbd9912ee (diff)
Merge commit 'f160c6a18a574b4c7d063e0a748037cbbd9912ee'
* commit 'f160c6a18a574b4c7d063e0a748037cbbd9912ee': lavfi: do not segfault on NULL passed to avfilter_get_by_name() Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/avfilter.c')
-rw-r--r--libavfilter/avfilter.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 484eda1c7f..211344c449 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -392,6 +392,9 @@ AVFilter *avfilter_get_by_name(const char *name)
{
AVFilter *f = NULL;
+ if (!name)
+ return NULL;
+
while ((f = avfilter_next(f)))
if (!strcmp(f->name, name))
return f;