[FFmpeg-cvslog] r25700 - in trunk: ffmpeg.c ffplay.c libavfilter/graphparser.c libavfilter/graphparser.h

[stefano]

Author: stefano
Date: Sun Nov  7 19:40:18 2010
New Revision: 25700

Log:
Rename AVFilterInOut field filter to filter_ctx, more semantically correct.

Modified:
   trunk/ffmpeg.c
   trunk/ffplay.c
   trunk/libavfilter/graphparser.c
   trunk/libavfilter/graphparser.h

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	Sun Nov  7 19:40:14 2010	(r25699)
+++ trunk/ffmpeg.c	Sun Nov  7 19:40:18 2010	(r25700)
@@ -388,12 +388,12 @@ static int configure_filters(AVInputStre
         AVFilterInOut *inputs  = av_malloc(sizeof(AVFilterInOut));
 
         outputs->name    = av_strdup("in");
-        outputs->filter  = last_filter;
+        outputs->filter_ctx = last_filter;
         outputs->pad_idx = 0;
         outputs->next    = NULL;
 
         inputs->name    = av_strdup("out");
-        inputs->filter  = ist->output_video_filter;
+        inputs->filter_ctx = ist->output_video_filter;
         inputs->pad_idx = 0;
         inputs->next    = NULL;
 

Modified: trunk/ffplay.c
==============================================================================
--- trunk/ffplay.c	Sun Nov  7 19:40:14 2010	(r25699)
+++ trunk/ffplay.c	Sun Nov  7 19:40:18 2010	(r25700)
@@ -1811,12 +1811,12 @@ static int video_thread(void *arg)
         AVFilterInOut *inputs  = av_malloc(sizeof(AVFilterInOut));
 
         outputs->name    = av_strdup("in");
-        outputs->filter  = filt_src;
+        outputs->filter_ctx = filt_src;
         outputs->pad_idx = 0;
         outputs->next    = NULL;
 
         inputs->name    = av_strdup("out");
-        inputs->filter  = filt_out;
+        inputs->filter_ctx = filt_out;
         inputs->pad_idx = 0;
         inputs->next    = NULL;
 

Modified: trunk/libavfilter/graphparser.c
==============================================================================
--- trunk/libavfilter/graphparser.c	Sun Nov  7 19:40:14 2010	(r25699)
+++ trunk/libavfilter/graphparser.c	Sun Nov  7 19:40:18 2010	(r25700)
@@ -207,13 +207,13 @@ static int link_filter_inouts(AVFilterCo
 
         *curr_inputs = (*curr_inputs)->next;
 
-        if (p->filter) {
-            if ((ret = link_filter(p->filter, p->pad_idx, filt_ctx, pad, log_ctx)) < 0)
+        if (p->filter_ctx) {
+            if ((ret = link_filter(p->filter_ctx, p->pad_idx, filt_ctx, pad, log_ctx)) < 0)
                 return ret;
             av_free(p->name);
             av_free(p);
         } else {
-            p->filter = filt_ctx;
+            p->filter_ctx = filt_ctx;
             p->pad_idx = pad;
             insert_inout(open_inputs, p);
         }
@@ -231,7 +231,7 @@ static int link_filter_inouts(AVFilterCo
         AVFilterInOut *currlinkn = av_mallocz(sizeof(AVFilterInOut));
         if (!currlinkn)
             return AVERROR(ENOMEM);
-        currlinkn->filter  = filt_ctx;
+        currlinkn->filter_ctx  = filt_ctx;
         currlinkn->pad_idx = pad;
         insert_inout(curr_inputs, currlinkn);
     }
@@ -293,8 +293,8 @@ static int parse_outputs(const char **bu
         match = extract_inout(name, open_inputs);
 
         if (match) {
-            if ((ret = link_filter(input->filter, input->pad_idx,
-                                   match->filter, match->pad_idx, log_ctx)) < 0)
+            if ((ret = link_filter(input->filter_ctx, input->pad_idx,
+                                   match->filter_ctx, match->pad_idx, log_ctx)) < 0)
                 return ret;
             av_free(match->name);
             av_free(name);

Modified: trunk/libavfilter/graphparser.h
==============================================================================
--- trunk/libavfilter/graphparser.h	Sun Nov  7 19:40:14 2010	(r25699)
+++ trunk/libavfilter/graphparser.h	Sun Nov  7 19:40:18 2010	(r25700)
@@ -30,7 +30,7 @@
  */
 typedef struct AVFilterInOut {
     char *name;
-    AVFilterContext *filter;
+    AVFilterContext *filter_ctx;
     int pad_idx;
 
     struct AVFilterInOut *next;