Mesa (11.0): st/vaapi: fix vaapi VC-1 simple/main corruption v2

[Emil Velikov]

Module: Mesa
Branch: 11.0
Commit: 71a785fc5f87d7755bfa90842cd7011be609d744
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=71a785fc5f87d7755bfa90842cd7011be609d744

Author: Boyuan Zhang <boyuan.zhang at amd.com>
Date:   Wed Sep 23 10:11:07 2015 +0200

st/vaapi: fix vaapi VC-1 simple/main corruption v2

Apply the start code fix only to advanced profile.

v2 (chk): add commit message

Signed-off-by: Boyuan Zhang <boyuan.zhang at amd.com>
Reviewed-by: Christian König <christian.koenig at amd.com>
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
Cc: "10.6 11.0" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit ed55def44febbe1662ddcc0c33a23308899ce488)

---

 src/gallium/state_trackers/va/picture.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/gallium/state_trackers/va/picture.c b/src/gallium/state_trackers/va/picture.c
index a0d530b..e20184c 100644
--- a/src/gallium/state_trackers/va/picture.c
+++ b/src/gallium/state_trackers/va/picture.c
@@ -500,8 +500,10 @@ handleVASliceDataBufferType(vlVaContext *context, vlVaBuffer *buf)
           bufHasStartcode(buf, 0x0000010b, 32))
          break;
 
+      if (context->decoder->profile == PIPE_VIDEO_PROFILE_VC1_ADVANCED) {
          buffers[num_buffers] = (void *const)&start_code_vc1;
          sizes[num_buffers++] = sizeof(start_code_vc1);
+      }
       break;
    case PIPE_VIDEO_FORMAT_MPEG4:
       if (bufHasStartcode(buf, 0x000001, 24))