summaryrefslogtreecommitdiffstats
path: root/spudec.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-04-26 18:37:56 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-04-26 18:38:11 +0300
commit8df340271e868252e7398307e126ea12083d426b (patch)
tree0380f4e6e3b8ad983b35db712c5d1da609f15e7d /spudec.c
parentb4c7b7ce1142e676bd082952b12713bcc5f3203e (diff)
parent12d6f6b378872ca4c06a268dc33c4e045f4966e4 (diff)
downloadmpv-8df340271e868252e7398307e126ea12083d426b.tar.bz2
mpv-8df340271e868252e7398307e126ea12083d426b.tar.xz
Merge svn changes up to r31040
Diffstat (limited to 'spudec.c')
-rw-r--r--spudec.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/spudec.c b/spudec.c
index e896aeef16..aedc1c04a9 100644
--- a/spudec.c
+++ b/spudec.c
@@ -174,7 +174,7 @@ static inline unsigned char get_nibble(packet_t *packet)
static inline int mkalpha(int i)
{
/* In mplayer's alpha planes, 0 is transparent, then 1 is nearly
- opaque upto 255 which is transparent */
+ opaque upto 255 which is fully opaque */
// extend 4 -> 8 bit
i |= i << 4;
return (uint8_t)(-i);
@@ -533,12 +533,6 @@ void spudec_assemble(void *this, unsigned char *packet, unsigned int len, int pt
mp_msg(MSGT_SPUDEC,MSGL_WARN,"SPUasm: packet too short\n");
return;
}
-#if 0
- if ((spu->packet_pts + 10000) < pts100) {
- // [cb] too long since last fragment: force new packet
- spu->packet_offset = 0;
- }
-#endif
spu->packet_pts = pts100;
if (spu->packet_offset == 0) {
unsigned int len2 = get_be16(packet);