aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-01-14 16:49:33 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2016-01-15 12:30:41 +0100
commitbe9b89314f32a882d6cee30b78a2972931c89772 (patch)
tree3b147d728881786156b63f320b90c3bd56b878f5
parentcdac68fbab6923a71431709c2109bd60d0f90bbd (diff)
downloadffmpeg-be9b89314f32a882d6cee30b78a2972931c89772.tar.gz
swscale: Move VScalerContext into vscale.c
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 7b6e6895f2cbfa90a39874d03e2fac392bcbd33b) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libswscale/swscale_internal.h9
-rw-r--r--libswscale/vscale.c10
2 files changed, 10 insertions, 9 deletions
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h
index 63c9fdd245..57cd7c7817 100644
--- a/libswscale/swscale_internal.h
+++ b/libswscale/swscale_internal.h
@@ -1003,15 +1003,6 @@ typedef struct FilterContext
int xInc;
} FilterContext;
-typedef struct VScalerContext
-{
- uint16_t *filter[2];
- int32_t *filter_pos;
- int filter_size;
- int isMMX;
- void *pfn;
-} VScalerContext;
-
// warp input lines in the form (src + width*i + j) to slice format (line[i][j])
// relative=true means first line src[x][0] otherwise first line is src[x][lum/crh Y]
int ff_init_slice_from_src(SwsSlice * s, uint8_t *src[4], int stride[4], int srcW, int lumY, int lumH, int chrY, int chrH, int relative);
diff --git a/libswscale/vscale.c b/libswscale/vscale.c
index 3d6e81a70f..f4b0b67ed0 100644
--- a/libswscale/vscale.c
+++ b/libswscale/vscale.c
@@ -19,6 +19,16 @@
*/
#include "swscale_internal.h"
+typedef struct VScalerContext
+{
+ uint16_t *filter[2];
+ int32_t *filter_pos;
+ int filter_size;
+ int isMMX;
+ void *pfn;
+} VScalerContext;
+
+
static int lum_planar_vscale(SwsContext *c, SwsFilterDescriptor *desc, int sliceY, int sliceH)
{
VScalerContext *inst = desc->instance;