[FFmpeg-cvslog] swscale: Move VScalerContext into vscale.c
Michael Niedermayer
git at videolan.org
Fri Jan 15 16:23:55 CET 2016
ffmpeg | branch: release/2.8 | Michael Niedermayer <michael at niedermayer.cc> | Thu Jan 14 16:49:33 2016 +0100| [be9b89314f32a882d6cee30b78a2972931c89772] | committer: Michael Niedermayer
swscale: Move VScalerContext into vscale.c
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 7b6e6895f2cbfa90a39874d03e2fac392bcbd33b)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=be9b89314f32a882d6cee30b78a2972931c89772
---
libswscale/swscale_internal.h | 9 ---------
libswscale/vscale.c | 10 ++++++++++
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h
index 63c9fdd..57cd7c7 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 3d6e81a..f4b0b67 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;
More information about the ffmpeg-cvslog
mailing list