summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY1
-rw-r--r--dvbspu.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/HISTORY b/HISTORY
index a73e8d01..b7f74d52 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1639,3 +1639,4 @@ Video Disk Recorder Revision History
helping to fix it).
- Fixed channel switching in case of an active 'Transfer Mode' on the primary
device ('Transfer Mode' is now launched with priority '-1').
+- Fixed a ternary expression in dvbspu.c.
diff --git a/dvbspu.c b/dvbspu.c
index 95edb1bc..4b31401a 100644
--- a/dvbspu.c
+++ b/dvbspu.c
@@ -8,7 +8,7 @@
*
* parts of this file are derived from the OMS program.
*
- * $Id: dvbspu.c 1.2 2002/09/29 13:48:39 kls Exp $
+ * $Id: dvbspu.c 1.3 2002/10/26 10:46:49 kls Exp $
*/
#include <assert.h>
@@ -192,7 +192,7 @@ void cDvbSpuBitmap::putFieldData(int field, uint8_t * data, uint8_t * endp)
int len = vlc >> 2;
// if len == 0 -> end sequence - fill to end of line
- len = len ? : bmpsize.x2 - xp + 1;
+ len = len ? len : bmpsize.x2 - xp + 1;
putPixel(xp, yp, len, color);
xp += len;