summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstefano <stefano@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-01-16 11:08:16 +0000
committerstefano <stefano@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-01-16 11:08:16 +0000
commit4644bd629319194c7673faea08058514bd24c7cb (patch)
tree7fc76da30e9dd62d579eb016832bc7c2328d30bf
parentf7c5fa6a1450a36dde0ec99d82d70adb92574599 (diff)
downloadmpv-4644bd629319194c7673faea08058514bd24c7cb.tar.bz2
mpv-4644bd629319194c7673faea08058514bd24c7cb.tar.xz
Simplify reset_ptr(): employ usePal() macro rather than enumerating
all the paletted formats. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30317 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libswscale/swscale.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index 15071ea218..71786b817a 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -2935,12 +2935,8 @@ static void reset_ptr(const uint8_t* src[], int format)
src[3]=NULL;
if(!isPlanarYUV(format)) {
src[3]=src[2]=NULL;
- if( format != PIX_FMT_PAL8
- && format != PIX_FMT_RGB8
- && format != PIX_FMT_BGR8
- && format != PIX_FMT_RGB4_BYTE
- && format != PIX_FMT_BGR4_BYTE
- )
+
+ if (!usePal(format))
src[1]= NULL;
}
}