[FFmpeg-cvslog] lavfi: fix null checking in avfilter_config_links()

Xi Wang git at videolan.org
Mon Jan 21 00:07:58 CET 2013


ffmpeg | branch: master | Xi Wang <xi.wang at gmail.com> | Sun Jan 20 15:38:21 2013 -0500| [eb553096e59898328ba4ac406ff5a25c29d59f0d] | committer: Michael Niedermayer

lavfi: fix null checking in avfilter_config_links()

Move the first use of `link' after the null pointer check.

Signed-off-by: Xi Wang <xi.wang at gmail.com>
Reviewed-by: Stefano Sabatini <stefasab at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eb553096e59898328ba4ac406ff5a25c29d59f0d
---

 libavfilter/avfilter.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 8c06173..4759d13 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -222,11 +222,11 @@ int avfilter_config_links(AVFilterContext *filter)
 
     for (i = 0; i < filter->nb_inputs; i ++) {
         AVFilterLink *link = filter->inputs[i];
-        AVFilterLink *inlink = link->src->nb_inputs ?
-            link->src->inputs[0] : NULL;
+        AVFilterLink *inlink;
 
         if (!link) continue;
 
+        inlink = link->src->nb_inputs ? link->src->inputs[0] : NULL;
         link->current_pts = AV_NOPTS_VALUE;
 
         switch (link->init_state) {



More information about the ffmpeg-cvslog mailing list