From 6de58b49032a206985602effec91e5e46c886ea2 Mon Sep 17 00:00:00 2001 From: Pedro Arthur Date: Mon, 28 Mar 2016 13:25:18 -0300 Subject: swscale: cleanup unused code Removed previous swscale code under '#ifndef NEW_FILTER' and removed unused fields of SwsContext --- libswscale/swscale_internal.h | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'libswscale/swscale_internal.h') diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index f48cbacce9..6647c7261f 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -350,12 +350,6 @@ typedef struct SwsContext { * vertical scaler is called. */ //@{ - int16_t **lumPixBuf; ///< Ring buffer for scaled horizontal luma plane lines to be fed to the vertical scaler. - int16_t **chrUPixBuf; ///< Ring buffer for scaled horizontal chroma plane lines to be fed to the vertical scaler. - int16_t **chrVPixBuf; ///< Ring buffer for scaled horizontal chroma plane lines to be fed to the vertical scaler. - int16_t **alpPixBuf; ///< Ring buffer for scaled horizontal alpha plane lines to be fed to the vertical scaler. - int vLumBufSize; ///< Number of vertical luma/alpha lines allocated in the ring buffer. - int vChrBufSize; ///< Number of vertical chroma lines allocated in the ring buffer. int lastInLumBuf; ///< Last scaled horizontal luma/alpha line from source in the ring buffer. int lastInChrBuf; ///< Last scaled horizontal chroma line from source in the ring buffer. int lumBufIndex; ///< Index in ring buffer of the last scaled horizontal luma/alpha line from source. @@ -363,6 +357,7 @@ typedef struct SwsContext { //@} uint8_t *formatConvBuffer; + int needAlpha; /** * @name Horizontal and vertical filters. @@ -1038,7 +1033,4 @@ void ff_init_vscale_pfn(SwsContext *c, yuv2planar1_fn yuv2plane1, yuv2planarX_fn //number of extra lines to process #define MAX_LINES_AHEAD 4 -// enable use of refactored scaler code -#define NEW_FILTER - #endif /* SWSCALE_SWSCALE_INTERNAL_H */ -- cgit v1.2.3