summaryrefslogtreecommitdiff
path: root/dvbspu.h
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2009-12-06 12:57:45 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2009-12-06 12:57:45 +0100
commit6a208294bef44f588e067383aa2e35af1aa23a16 (patch)
tree463f2aa875c26a6d0df507c2559a9bb821111082 /dvbspu.h
parent1b973fd8ebb0a5dca7c82fac0651c33ecb7edd50 (diff)
downloadvdr-6a208294bef44f588e067383aa2e35af1aa23a16.tar.gz
vdr-6a208294bef44f588e067383aa2e35af1aa23a16.tar.bz2
Several code modifications to avoid compiler warnings
Diffstat (limited to 'dvbspu.h')
-rw-r--r--dvbspu.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/dvbspu.h b/dvbspu.h
index 42aa7f08..d6f9d343 100644
--- a/dvbspu.h
+++ b/dvbspu.h
@@ -8,7 +8,7 @@
*
* parts of this file are derived from the OMS program.
*
- * $Id: dvbspu.h 2.2 2009/12/05 14:40:08 kls Exp $
+ * $Id: dvbspu.h 2.3 2009/12/05 15:17:08 kls Exp $
*/
#ifndef __DVBSPU_H
@@ -197,8 +197,7 @@ inline uint32_t cDvbSpuPalette::yuv2rgb(uint32_t yuv_color)
inline uint32_t cDvbSpuPalette::getColor(uint8_t idx, uint8_t trans) const
{
- uint8_t t = trans == 0x0f ? 0xff : trans << 4;
- return palette[idx] | (t << 24);
+ return palette[idx] | (trans == 0x0f) ? 0xff000000 : (trans << 28);
}
#endif // __DVBSPU_H