genX_mfd: fix unnecessary variable reuse

Signed-off-by: Jerome Borsboom <jerome.borsboom@carpalis.nl>

diff --git a/src/gen6_mfd.c b/src/gen6_mfd.c
index f238914..c77a807 100644 (file)
--- a/src/gen6_mfd.c
+++ b/src/gen6_mfd.c
@@ -1375,7 +1375,7 @@ gen6_mfd_vc1_pic_state(VADriverContextP ctx,
     int fcm = 0;
     int picture_type;
     int profile;
-    int overlap;
+    int overlap = 0;
 
     assert(decode_state->pic_param && decode_state->pic_param->buffer);
     pic_param = (VAPictureParameterBufferVC1 *)decode_state->pic_param->buffer;
@@ -1515,10 +1515,7 @@ gen6_mfd_vc1_pic_state(VADriverContextP ctx,
             brfd = 0;
     }
 
-    overlap = pic_param->sequence_fields.bits.overlap;
-
-    if (overlap) {
-        overlap = 0;
+    if (pic_param->sequence_fields.bits.overlap) {
         if (profile != GEN6_VC1_ADVANCED_PROFILE) {
             if (pic_param->pic_quantizer_fields.bits.pic_quantizer_scale >= 9 &&
                 pic_param->picture_fields.bits.picture_type != GEN6_VC1_B_PICTURE) {

diff --git a/src/gen75_mfd.c b/src/gen75_mfd.c
index 1768730..0f35a3a 100644 (file)
--- a/src/gen75_mfd.c
+++ b/src/gen75_mfd.c
@@ -1699,7 +1699,7 @@ gen75_mfd_vc1_pic_state(VADriverContextP ctx,
     int fcm = 0;
     int picture_type;
     int profile;
-    int overlap;
+    int overlap = 0;
     int interpolation_mode = 0;
 
     assert(decode_state->pic_param && decode_state->pic_param->buffer);
@@ -1841,10 +1841,7 @@ gen75_mfd_vc1_pic_state(VADriverContextP ctx,
             brfd = 0;
     }
 
-    overlap = pic_param->sequence_fields.bits.overlap;
-
-    if (overlap) {
-        overlap = 0;
+    if (pic_param->sequence_fields.bits.overlap) {
         if (profile != GEN7_VC1_ADVANCED_PROFILE) {
             if (pic_param->pic_quantizer_fields.bits.pic_quantizer_scale >= 9 &&
                 pic_param->picture_fields.bits.picture_type != GEN7_VC1_B_PICTURE) {

diff --git a/src/gen7_mfd.c b/src/gen7_mfd.c
index 2780459..54035ab 100644 (file)
--- a/src/gen7_mfd.c
+++ b/src/gen7_mfd.c
@@ -1434,7 +1434,7 @@ gen7_mfd_vc1_pic_state(VADriverContextP ctx,
     int fcm = 0;
     int picture_type;
     int profile;
-    int overlap;
+    int overlap = 0;
     int interpolation_mode = 0;
 
     assert(decode_state->pic_param && decode_state->pic_param->buffer);
@@ -1576,10 +1576,7 @@ gen7_mfd_vc1_pic_state(VADriverContextP ctx,
             brfd = 0;
     }
 
-    overlap = pic_param->sequence_fields.bits.overlap;
-
-    if (overlap) {
-        overlap = 0;
+    if (pic_param->sequence_fields.bits.overlap) {
         if (profile != GEN7_VC1_ADVANCED_PROFILE) {
             if (pic_param->pic_quantizer_fields.bits.pic_quantizer_scale >= 9 &&
                 pic_param->picture_fields.bits.picture_type != GEN7_VC1_B_PICTURE) {

diff --git a/src/gen8_mfd.c b/src/gen8_mfd.c
index bd0015a..dfb158c 100644 (file)
--- a/src/gen8_mfd.c
+++ b/src/gen8_mfd.c
@@ -1478,7 +1478,7 @@ gen8_mfd_vc1_pic_state(VADriverContextP ctx,
     int fcm = 0;
     int picture_type;
     int profile;
-    int overlap;
+    int overlap = 0;
     int interpolation_mode = 0;
 
     assert(decode_state->pic_param && decode_state->pic_param->buffer);
@@ -1620,10 +1620,7 @@ gen8_mfd_vc1_pic_state(VADriverContextP ctx,
             brfd = 0;
     }
 
-    overlap = pic_param->sequence_fields.bits.overlap;
-
-    if (overlap) {
-        overlap = 0;
+    if (pic_param->sequence_fields.bits.overlap) {
         if (profile != GEN7_VC1_ADVANCED_PROFILE) {
             if (pic_param->pic_quantizer_fields.bits.pic_quantizer_scale >= 9 &&
                 pic_param->picture_fields.bits.picture_type != GEN7_VC1_B_PICTURE) {