diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2003-02-23 22:05:55 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-02-23 22:05:55 +0000 |
| commit | d4e242755f3a3c5c27b26b86cccd4670c4bd3b40 (patch) | |
| tree | ce934efe60fcfa2cdee7d925d700f11509ea5975 /postproc/swscale_internal.h | |
| parent | efa04ce2967724778a10a1db0fa65fa693625557 (diff) | |
| download | ffmpeg-d4e242755f3a3c5c27b26b86cccd4670c4bd3b40.tar.gz | |
sws_ prefix, more seperation between internal & external swscaler API
sws_scale() returns the number of outputed lines
Originally committed as revision 9495 to svn://svn.mplayerhq.hu/mplayer/trunk/postproc
Diffstat (limited to 'postproc/swscale_internal.h')
| -rw-r--r-- | postproc/swscale_internal.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/postproc/swscale_internal.h b/postproc/swscale_internal.h index 0697d97e62..fe7da66087 100644 --- a/postproc/swscale_internal.h +++ b/postproc/swscale_internal.h @@ -21,13 +21,12 @@ #define MAX_FILTER_SIZE 256 -struct SwsContext; - -typedef void (*SwsFunc)(struct SwsContext *context, uint8_t* src[], int srcStride[], int srcSliceY, +typedef int (*SwsFunc)(struct SwsContext *context, uint8_t* src[], int srcStride[], int srcSliceY, int srcSliceH, uint8_t* dst[], int dstStride[]); /* this struct should be aligned on at least 32-byte boundary */ typedef struct SwsContext{ + SwsFunc swScale; int srcW, srcH, dstH; int chrSrcW, chrSrcH, chrDstW, chrDstH; int lumXInc, chrXInc; @@ -85,8 +84,6 @@ typedef struct SwsContext{ int dstColorspaceTable[4]; int srcRange, dstRange; - SwsFunc swScale; - #define RED_DITHER "0*8" #define GREEN_DITHER "1*8" #define BLUE_DITHER "2*8" @@ -121,7 +118,6 @@ typedef struct SwsContext{ int esp; } SwsContext; //FIXME check init (where 0) -//FIXME split private & public inline void sws_orderYUV(int format, uint8_t * sortedP[], int sortedStride[], uint8_t * p[], int stride[]); SwsFunc yuv2rgb_get_func_ptr (SwsContext *c); |