shithub: libvpx

Download patch

ref: 9409af20832933454eb8f9084a35781b92c10734
parent: f182376dd61bda9481309eb94050c8e85f6fa5b0
author: Johann <johannkoenig@google.com>
date: Mon Oct 24 12:56:55 EDT 2011

remove uninitialized variable warning

Restructure if statement to clarify the error condition. Trigger the
error before clobbering pc-> variables.

Change-Id: Id01cab798a341ce9899078fdcec265a0e942a0b7

--- a/vp8/decoder/decodframe.c
+++ b/vp8/decoder/decodframe.c
@@ -667,21 +667,19 @@
 
     if (data_end - data < 3)
     {
-        if (pbi->ec_active)
+        if (!pbi->ec_active)
         {
-            /* Declare the missing frame as an inter frame since it will
-               be handled as an inter frame when we have estimated its
-               motion vectors. */
-            pc->frame_type = INTER_FRAME;
-            pc->version = 0;
-            pc->show_frame = 1;
-            first_partition_length_in_bytes = 0;
-        }
-        else
-        {
             vpx_internal_error(&pc->error, VPX_CODEC_CORRUPT_FRAME,
                                "Truncated packet");
         }
+
+        /* Declare the missing frame as an inter frame since it will
+           be handled as an inter frame when we have estimated its
+           motion vectors. */
+        pc->frame_type = INTER_FRAME;
+        pc->version = 0;
+        pc->show_frame = 1;
+        first_partition_length_in_bytes = 0;
     }
     else
     {
--