diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-07-07 02:56:01 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-07-07 02:56:01 +0300 |
commit | a2037a2effbd4622d0e8336245a9b14c3f886bde (patch) | |
tree | bd2face6dd36d2663197b23a33da9e9b2814f70c /libswscale/swscale-example.c | |
parent | 0c2773a709276681575d2507aa60ee85c2d0b850 (diff) | |
parent | 43079c51daa8c12b0a44e5ad8022c979dd9e8336 (diff) | |
download | mpv-a2037a2effbd4622d0e8336245a9b14c3f886bde.tar.bz2 mpv-a2037a2effbd4622d0e8336245a9b14c3f886bde.tar.xz |
Merge svn changes up to r29412
Diffstat (limited to 'libswscale/swscale-example.c')
-rw-r--r-- | libswscale/swscale-example.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libswscale/swscale-example.c b/libswscale/swscale-example.c index 8d60332897..c9916e5489 100644 --- a/libswscale/swscale-example.c +++ b/libswscale/swscale-example.c @@ -30,6 +30,12 @@ #include "swscale.h" #include "swscale_internal.h" +#undef fprintf +#undef free +#undef malloc +#undef perror +#undef printf + static uint64_t getSSD(uint8_t *src1, uint8_t *src2, int stride1, int stride2, int w, int h){ int x,y; uint64_t ssd=0; @@ -66,11 +72,15 @@ static int doTest(uint8_t *ref[4], int refStride[4], int w, int h, int srcFormat // avoid stride % bpp != 0 if (srcFormat==PIX_FMT_RGB24 || srcFormat==PIX_FMT_BGR24) srcStride[i]= srcW*3; + else if (srcFormat==PIX_FMT_RGB48BE || srcFormat==PIX_FMT_RGB48LE) + srcStride[i]= srcW*6; else srcStride[i]= srcW*4; if (dstFormat==PIX_FMT_RGB24 || dstFormat==PIX_FMT_BGR24) dstStride[i]= dstW*3; + else if (dstFormat==PIX_FMT_RGB48BE || dstFormat==PIX_FMT_RGB48LE) + dstStride[i]= dstW*6; else dstStride[i]= dstW*4; |