ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Thu Jan 14 16:51:34 2016 +0100| [e06403331cecae4686a1590793eb5a2c064b2478] | committer: Michael Niedermayer
swscale: Move Contexts used only in hscale.c into it Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e06403331cecae4686a1590793eb5a2c064b2478 --- libswscale/hscale.c | 15 +++++++++++++++ libswscale/swscale_internal.h | 15 --------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/libswscale/hscale.c b/libswscale/hscale.c index ca09576..9f9d35b 100644 --- a/libswscale/hscale.c +++ b/libswscale/hscale.c @@ -20,6 +20,21 @@ #include "swscale_internal.h" +/// Scaler instance data +typedef struct FilterContext +{ + uint16_t *filter; + int *filter_pos; + int filter_size; + int xInc; +} FilterContext; + +/// Color conversion instance data +typedef struct ColorContext +{ + uint32_t *pal; +} ColorContext; + static int lum_h_scale(SwsContext *c, SwsFilterDescriptor *desc, int sliceY, int sliceH) { FilterContext *instance = desc->instance; diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index 80c1dc2..fa288bd 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -989,21 +989,6 @@ typedef struct SwsFilterDescriptor int (*process)(SwsContext *c, struct SwsFilterDescriptor *desc, int sliceY, int sliceH); } SwsFilterDescriptor; -/// Color conversion instance data -typedef struct ColorContext -{ - uint32_t *pal; -} ColorContext; - -/// Scaler instance data -typedef struct FilterContext -{ - uint16_t *filter; - int *filter_pos; - int filter_size; - int xInc; -} FilterContext; - // 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); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
