From f83a83e8ab97e0fcab2248e828d4fb5433e8bcfe Mon Sep 17 00:00:00 2001
From: Pedro Arthur <bygrandao@gmail.com>
Date: Sun, 21 Jun 2015 12:52:26 -0300
Subject: [PATCH] swscale: rename instance structs

---
 libswscale/slice.c            | 8 ++++----
 libswscale/swscale_internal.h | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libswscale/slice.c b/libswscale/slice.c
index 23532d8..07eb754 100644
--- a/libswscale/slice.c
+++ b/libswscale/slice.c
@@ -137,7 +137,7 @@ static int init_slice_1(SwsSlice *s, uint8_t *v, uint8_t *v2, int dstW, int slic
 
 static int lum_h_scale(SwsContext *c, SwsFilterDescriptor *desc, int sliceY, int sliceH)
 {
-    LumScaleInstance *instance = desc->instance;
+    ScaleInstance *instance = desc->instance;
     int srcW = desc->src->width;
     int dstW = desc->dst->width;
     int xInc = instance->xInc;
@@ -187,7 +187,7 @@ static int lum_h_scale(SwsContext *c, SwsFilterDescriptor *desc, int sliceY, int
 static int lum_convert(SwsContext *c, SwsFilterDescriptor *desc, int sliceY, int sliceH)
 {
     int srcW = desc->src->width;
-    LumConvertInstance * instance = desc->instance;
+    ConvertInstance * instance = desc->instance;
     uint32_t * pal = instance->pal;
 
     int sp = sliceY - desc->src->plane[0].sliceY;
@@ -227,7 +227,7 @@ static int lum_convert(SwsContext *c, SwsFilterDescriptor *desc, int sliceY, int
 
 static int init_desc_fmt_convert(SwsFilterDescriptor *desc, SwsSlice * src, SwsSlice *dst, uint32_t *pal)
 {
-    LumConvertInstance * li = av_malloc(sizeof(LumConvertInstance));
+    ConvertInstance * li = av_malloc(sizeof(ConvertInstance));
     if (!li)
         return AVERROR(ENOMEM);
     li->pal = pal;
@@ -244,7 +244,7 @@ static int init_desc_fmt_convert(SwsFilterDescriptor *desc, SwsSlice * src, SwsS
 
 static int init_desc_hscale(SwsFilterDescriptor *desc, SwsSlice *src, SwsSlice *dst, uint16_t *filter, int * filter_pos, int filter_size, int xInc)
 {
-    LumScaleInstance *li = av_malloc(sizeof(LumScaleInstance));
+    ScaleInstance *li = av_malloc(sizeof(ScaleInstance));
     if (!li)
         return AVERROR(ENOMEM);
 
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h
index 2fbbb5e..3256b7b 100644
--- a/libswscale/swscale_internal.h
+++ b/libswscale/swscale_internal.h
@@ -945,18 +945,18 @@ typedef struct SwsFilterDescriptor
    int (*process)(SwsContext*, struct SwsFilterDescriptor*, int, int);
 } SwsFilterDescriptor;
 
-typedef struct LumConvertInstance
+typedef struct ConvertInstance
 {
     uint32_t * pal;
-} LumConvertInstance;
+} ConvertInstance;
 
-typedef struct LumScaleInstance
+typedef struct ScaleInstance
 {
     uint16_t * filter;
     int * filter_pos;
     int filter_size;
     int xInc;
-} LumScaleInstance;
+} ScaleInstance;
 
 int ff_init_slice_from_src(SwsSlice * s, uint8_t *src[4], int stride[4], int srcW, int sliceY, int sliceH, int skip);
 int ff_init_slice_from_lp(SwsSlice *s, uint8_t ***linesPool, int dstW, int sliceY, int sliceH);
-- 
1.9.1