summaryrefslogtreecommitdiff
path: root/i965_media.c
diff options
context:
space:
mode:
authorXiang, Haihao <haihao.xiang@intel.com>2010-05-17 17:17:36 +0800
committerXiang, Haihao <haihao.xiang@intel.com>2010-06-02 13:53:17 +0800
commit6dff9f6d422a20a68dc0cfb95aa048e3b9cac56f (patch)
treec913651833da08584ca0225ccddc3a48353112af /i965_media.c
parentae81bf31d97c1768ed5e7287f2ec232a9b59b0a9 (diff)
downloadlibva-intel-driver-6dff9f6d422a20a68dc0cfb95aa048e3b9cac56f.tar.gz
libva-intel-driver-6dff9f6d422a20a68dc0cfb95aa048e3b9cac56f.tar.bz2
libva-intel-driver-6dff9f6d422a20a68dc0cfb95aa048e3b9cac56f.zip
i965_drv_video: fix initialization function
Diffstat (limited to 'i965_media.c')
-rw-r--r--i965_media.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/i965_media.c b/i965_media.c
index fe755ab..6377933 100644
--- a/i965_media.c
+++ b/i965_media.c
@@ -283,8 +283,6 @@ i965_media_decode_picture(VADriverContextP ctx,
Bool
i965_media_init(VADriverContextP ctx)
{
- i965_media_mpeg2_init(ctx);
- i965_media_h264_init(ctx);
return True;
}
@@ -295,6 +293,9 @@ i965_media_terminate(VADriverContextP ctx)
struct i965_media_state *media_state = &i965->media_state;
int i;
+ assert(media_state->free_private_context);
+ media_state->free_private_context(&media_state->private_context);
+
for (i = 0; i < MAX_MEDIA_SURFACES; i++) {
dri_bo_unreference(media_state->surface_state[i].bo);
media_state->surface_state[i].bo = NULL;
@@ -318,8 +319,6 @@ i965_media_terminate(VADriverContextP ctx)
dri_bo_unreference(media_state->indirect_object.bo);
media_state->indirect_object.bo = NULL;
- i965_media_mpeg2_ternimate(ctx);
- i965_media_h264_ternimate(ctx);
return True;
}