[vlc-devel] [PATCH 11/15] filter_chain: rename internal owner to downstream

[Steve Lhomme]

---
 src/misc/filter_chain.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/misc/filter_chain.c b/src/misc/filter_chain.c
index e9c0996245..3367454cbc 100644
--- a/src/misc/filter_chain.c
+++ b/src/misc/filter_chain.c
@@ -46,7 +46,7 @@ typedef struct chained_filter_t
 struct filter_chain_t
 {
     vlc_object_t *obj;
-    filter_owner_t owner; /**< Owner (downstream) callbacks */
+    filter_owner_t downstream; /**< Owner (downstream) callbacks */
 
     chained_filter_t *first, *last; /**< List of filters */
 
@@ -75,9 +75,9 @@ static filter_chain_t *filter_chain_NewInner( vlc_object_t *obj,
 
     chain->obj = obj;
     if( owner != NULL )
-        chain->owner = *owner;
+        chain->downstream = *owner;
     else
-        memset(&chain->owner, 0, sizeof(chain->owner));
+        memset(&chain->downstream, 0, sizeof(chain->downstream));
     chain->first = NULL;
     chain->last = NULL;
     es_format_Init( &chain->fmt_in, cat, 0 );
@@ -104,7 +104,7 @@ static picture_t *filter_chain_VideoBufferNew( filter_t *chained_filter, void *s
     filter_chain_t *chain = sys;
     chained_filter_t *chained = container_of(chained_filter, chained_filter_t, filter);
     if( chained->next != NULL ||
-        chain->owner.video == NULL || chain->owner.video->buffer_new == NULL )
+        chain->downstream.video == NULL || chain->downstream.video->buffer_new == NULL )
     {
         // HACK as intermediate filters may not have the same video format as
         // the last one handled by the owner
@@ -113,7 +113,7 @@ static picture_t *filter_chain_VideoBufferNew( filter_t *chained_filter, void *s
     else
     {
         // the owner of the chain requires pictures to be grabbed from its callback
-        pic = chain->owner.video->buffer_new( chained_filter, chain->downstream.sys );
+        pic = chain->downstream.video->buffer_new( chained_filter, chain->downstream.sys );
     }
     if( pic == NULL )
         msg_Err( chained_filter, "Failed to allocate picture" );
-- 
2.17.1