diff options
| author | Luca Abeni <lucabe72@email.it> | 2006-09-17 15:15:13 +0000 |
|---|---|---|
| committer | Luca Abeni <lucabe72@email.it> | 2006-09-17 15:15:13 +0000 |
| commit | e9e12f0e11f43cab3e61257b95f6a6b0ac21b202 (patch) | |
| tree | 056fc348845314980be2f0b560b70d2e9c0331c9 /libswscale/yuv2rgb_mlib.c | |
| parent | 5784b620d2593be10b401eb5f8c317fd7ec2d83f (diff) | |
| download | ffmpeg-e9e12f0e11f43cab3e61257b95f6a6b0ac21b202.tar.gz | |
Remove the dependency of libswscale on img_format.h
Originally committed as revision 19878 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
Diffstat (limited to 'libswscale/yuv2rgb_mlib.c')
| -rw-r--r-- | libswscale/yuv2rgb_mlib.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libswscale/yuv2rgb_mlib.c b/libswscale/yuv2rgb_mlib.c index 69c4ad303d..824ee39d1b 100644 --- a/libswscale/yuv2rgb_mlib.c +++ b/libswscale/yuv2rgb_mlib.c @@ -30,12 +30,11 @@ #include <stdlib.h> #include <assert.h> -#include "libmpcodecs/img_format.h" //FIXME try to reduce dependency of such stuff #include "swscale.h" static int mlib_YUV2ARGB420_32(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY, int srcSliceH, uint8_t* dst[], int dstStride[]){ - if(c->srcFormat == IMGFMT_422P){ + if(c->srcFormat == PIX_FMT_YUV422P){ srcStride[1] *= 2; srcStride[2] *= 2; } @@ -49,7 +48,7 @@ static int mlib_YUV2ARGB420_32(SwsContext *c, uint8_t* src[], int srcStride[], i static int mlib_YUV2ABGR420_32(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY, int srcSliceH, uint8_t* dst[], int dstStride[]){ - if(c->srcFormat == IMGFMT_422P){ + if(c->srcFormat == PIX_FMT_YUV422P){ srcStride[1] *= 2; srcStride[2] *= 2; } @@ -63,7 +62,7 @@ static int mlib_YUV2ABGR420_32(SwsContext *c, uint8_t* src[], int srcStride[], i static int mlib_YUV2RGB420_24(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY, int srcSliceH, uint8_t* dst[], int dstStride[]){ - if(c->srcFormat == IMGFMT_422P){ + if(c->srcFormat == PIX_FMT_YUV422P){ srcStride[1] *= 2; srcStride[2] *= 2; } @@ -79,9 +78,9 @@ static int mlib_YUV2RGB420_24(SwsContext *c, uint8_t* src[], int srcStride[], in SwsFunc yuv2rgb_init_mlib(SwsContext *c) { switch(c->dstFormat){ - case IMGFMT_RGB24: return mlib_YUV2RGB420_24; - case IMGFMT_RGB32: return mlib_YUV2ARGB420_32; - case IMGFMT_BGR32: return mlib_YUV2ABGR420_32; + case PIX_FMT_RGB24: return mlib_YUV2RGB420_24; + case PIX_FMT_BGR32: return mlib_YUV2ARGB420_32; + case PIX_FMT_RGB32: return mlib_YUV2ABGR420_32; default: return NULL; } } |