diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-10-06 12:10:34 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-10-08 07:13:26 +0200 |
| commit | 716d413c13981da15323c7a3821860536eefdbbb (patch) | |
| tree | b15ebcded50b8edaa5b9fc8f261774043138e1fa /libswscale/x86/swscale.c | |
| parent | 78071a1420b425dfb787ac739048f523007b8139 (diff) | |
| download | ffmpeg-716d413c13981da15323c7a3821860536eefdbbb.tar.gz | |
Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat
Diffstat (limited to 'libswscale/x86/swscale.c')
| -rw-r--r-- | libswscale/x86/swscale.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c index 23d09d9ffe..ba7990e20b 100644 --- a/libswscale/x86/swscale.c +++ b/libswscale/x86/swscale.c @@ -111,7 +111,7 @@ void updateMMXDitherTables(SwsContext *c, int dstY, int lumBufIndex, int chrBufI const int firstChrSrcY= vChrFilterPos[chrDstY]; //First line needed as input c->blueDither= ff_dither8[dstY&1]; - if (c->dstFormat == PIX_FMT_RGB555 || c->dstFormat == PIX_FMT_BGR555) + if (c->dstFormat == AV_PIX_FMT_RGB555 || c->dstFormat == AV_PIX_FMT_BGR555) c->greenDither= ff_dither8[dstY&1]; else c->greenDither= ff_dither4[dstY&1]; @@ -351,7 +351,7 @@ switch(c->dstBpc){ \ default: vscalefn = ff_yuv2plane1_8_ ## opt1; break; \ } #define case_rgb(x, X, opt) \ - case PIX_FMT_ ## X: \ + case AV_PIX_FMT_ ## X: \ c->lumToYV12 = ff_ ## x ## ToY_ ## opt; \ if (!c->chrSrcHSubSample) \ c->chrToYV12 = ff_ ## x ## ToUV_ ## opt; \ @@ -363,23 +363,23 @@ switch(c->dstBpc){ \ ASSIGN_VSCALE_FUNC(c->yuv2plane1, mmx, mmx2, cpu_flags & AV_CPU_FLAG_MMXEXT); switch (c->srcFormat) { - case PIX_FMT_Y400A: + case AV_PIX_FMT_Y400A: c->lumToYV12 = ff_yuyvToY_mmx; if (c->alpPixBuf) c->alpToYV12 = ff_uyvyToY_mmx; break; - case PIX_FMT_YUYV422: + case AV_PIX_FMT_YUYV422: c->lumToYV12 = ff_yuyvToY_mmx; c->chrToYV12 = ff_yuyvToUV_mmx; break; - case PIX_FMT_UYVY422: + case AV_PIX_FMT_UYVY422: c->lumToYV12 = ff_uyvyToY_mmx; c->chrToYV12 = ff_uyvyToUV_mmx; break; - case PIX_FMT_NV12: + case AV_PIX_FMT_NV12: c->chrToYV12 = ff_nv12ToUV_mmx; break; - case PIX_FMT_NV21: + case AV_PIX_FMT_NV21: c->chrToYV12 = ff_nv21ToUV_mmx; break; case_rgb(rgb24, RGB24, mmx); @@ -412,23 +412,23 @@ switch(c->dstBpc){ \ ASSIGN_VSCALE_FUNC(c->yuv2plane1, sse2, sse2, 1); switch (c->srcFormat) { - case PIX_FMT_Y400A: + case AV_PIX_FMT_Y400A: c->lumToYV12 = ff_yuyvToY_sse2; if (c->alpPixBuf) c->alpToYV12 = ff_uyvyToY_sse2; break; - case PIX_FMT_YUYV422: + case AV_PIX_FMT_YUYV422: c->lumToYV12 = ff_yuyvToY_sse2; c->chrToYV12 = ff_yuyvToUV_sse2; break; - case PIX_FMT_UYVY422: + case AV_PIX_FMT_UYVY422: c->lumToYV12 = ff_uyvyToY_sse2; c->chrToYV12 = ff_uyvyToUV_sse2; break; - case PIX_FMT_NV12: + case AV_PIX_FMT_NV12: c->chrToYV12 = ff_nv12ToUV_sse2; break; - case PIX_FMT_NV21: + case AV_PIX_FMT_NV21: c->chrToYV12 = ff_nv21ToUV_sse2; break; case_rgb(rgb24, RGB24, sse2); @@ -468,16 +468,16 @@ switch(c->dstBpc){ \ ASSIGN_VSCALE_FUNC(c->yuv2plane1, avx, avx, 1); switch (c->srcFormat) { - case PIX_FMT_YUYV422: + case AV_PIX_FMT_YUYV422: c->chrToYV12 = ff_yuyvToUV_avx; break; - case PIX_FMT_UYVY422: + case AV_PIX_FMT_UYVY422: c->chrToYV12 = ff_uyvyToUV_avx; break; - case PIX_FMT_NV12: + case AV_PIX_FMT_NV12: c->chrToYV12 = ff_nv12ToUV_avx; break; - case PIX_FMT_NV21: + case AV_PIX_FMT_NV21: c->chrToYV12 = ff_nv21ToUV_avx; break; case_rgb(rgb24, RGB24, avx); |