]> git.sesse.net Git - vlc/commitdiff
* Don't ignore blank alpha pallettes. Tested with all my DVDs. Fixes #560
authorDerk-Jan Hartman <hartman@videolan.org>
Sun, 2 Apr 2006 14:28:55 +0000 (14:28 +0000)
committerDerk-Jan Hartman <hartman@videolan.org>
Sun, 2 Apr 2006 14:28:55 +0000 (14:28 +0000)
modules/codec/spudec/parse.c

index 7e0633791bd3983526eb7d48bc6f13d5f293f08c..fe7381a9b45de7c0ffc55b78f2cdd065e0099816 100644 (file)
@@ -243,24 +243,10 @@ static int ParseControlSeq( decoder_t *p_dec, subpicture_t *p_spu,
                 return VLC_EGENERIC;
             }
 
-            pi_alpha[3] = (p_sys->buffer[i_index+1]>>4)&0x0f;
-            pi_alpha[2] = (p_sys->buffer[i_index+1])&0x0f;
-            pi_alpha[1] = (p_sys->buffer[i_index+2]>>4)&0x0f;
-            pi_alpha[0] = (p_sys->buffer[i_index+2])&0x0f;
-
-            /* Ignore blank alpha palette. Sometimes spurious blank
-             * alpha palettes are present - dunno why. */
-            if( pi_alpha[0] | pi_alpha[1] | pi_alpha[2] | pi_alpha[3] )
-            {
-                p_spu_data->pi_alpha[0] = pi_alpha[0];
-                p_spu_data->pi_alpha[1] = pi_alpha[1];
-                p_spu_data->pi_alpha[2] = pi_alpha[2];
-                p_spu_data->pi_alpha[3] = pi_alpha[3];
-            }
-            else
-            {
-                msg_Warn( p_dec, "ignoring blank alpha palette" );
-            }
+            p_spu_data->pi_alpha[3] = (p_sys->buffer[i_index+1]>>4)&0x0f;
+            p_spu_data->pi_alpha[2] = (p_sys->buffer[i_index+1])&0x0f;
+            p_spu_data->pi_alpha[1] = (p_sys->buffer[i_index+2]>>4)&0x0f;
+            p_spu_data->pi_alpha[0] = (p_sys->buffer[i_index+2])&0x0f;
 
             i_index += 3;
             break;