fix inadvertent logic error in conditional

The condition:

  slice_param->slice_type != SLICE_TYPE_I ||
    slice_param->slice_type != SLICE_TYPE_SI

...is always true.  This appears to be an inadvertent
logic error by original author.  The assumption is that
&& was the intention and makes more sense, thus change it
to us && instead of ||.

Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com>

diff --git a/src/i965_avc_bsd.c b/src/i965_avc_bsd.c
index 36eeb7c..d422382 100644 (file)
--- a/src/i965_avc_bsd.c
+++ b/src/i965_avc_bsd.c
@@ -844,7 +844,7 @@ i965_avc_bsd_pipeline(VADriverContextP ctx, struct decode_state *decode_state, v
                    (slice_param->slice_type == SLICE_TYPE_B));
 
             if (i965_h264_context->picture.i_flag &&
-                (slice_param->slice_type != SLICE_TYPE_I ||
+                (slice_param->slice_type != SLICE_TYPE_I &&
                  slice_param->slice_type != SLICE_TYPE_SI))
                 i965_h264_context->picture.i_flag = 0;