lavc/tta: Use a safer check for encrypted streams
authorJames Almer <jamrial@gmail.com>
Sat, 16 Feb 2013 04:12:30 +0000 (01:12 -0300)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Feb 2013 23:34:38 +0000 (00:34 +0100)
The user can provide a password even when the stream
is not encrypted, so check the value of s->format
instead of s->pass in ttafilter_init().

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/tta.c

index bcbe037..4240946 100644 (file)
@@ -99,7 +99,7 @@ static const int32_t ttafilter_configs[4] = {
 
 static void ttafilter_init(TTAContext *s, TTAFilter *c, int32_t shift) {
     memset(c, 0, sizeof(TTAFilter));
-    if (s->pass) {
+    if (s->format == FORMAT_ENCRYPTED) {
         int i;
         for (i = 0; i < 8; i++)
             c->qm[i] = sign_extend(s->crc_pass[i], 8);