From a4f30ff9f74a205f9ad39fd5c76fbda32d064771 Mon Sep 17 00:00:00 2001 From: "gbeauchesne@splitted-desktop.com" Date: Sun, 11 Jul 2010 23:33:13 +0200 Subject: [PATCH] use VA_INVALID_ID wherever appropriate (vaapi). Signed-off-by: Laurent Aimar --- modules/codec/avcodec/vaapi.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/codec/avcodec/vaapi.c b/modules/codec/avcodec/vaapi.c index f57439cdfe..de0de4c603 100644 --- a/modules/codec/avcodec/vaapi.c +++ b/modules/codec/avcodec/vaapi.c @@ -130,6 +130,7 @@ static int Open( vlc_va_vaapi_t *p_va, int i_codec_id ) memset( p_va, 0, sizeof(*p_va) ); p_va->i_config_id = VA_INVALID_ID; p_va->i_context_id = VA_INVALID_ID; + p_va->image.image_id = VA_INVALID_ID; /* Create a VA display */ if( !XInitThreads() ) @@ -178,7 +179,7 @@ error: static void DestroySurfaces( vlc_va_vaapi_t *p_va ) { - if( p_va->image.image_id != VA_INVALID_SURFACE ) + if( p_va->image.image_id != VA_INVALID_ID ) { CopyCleanCache( &p_va->image_cache ); vaDestroyImage( p_va->p_display, p_va->image.image_id ); @@ -197,7 +198,7 @@ static void DestroySurfaces( vlc_va_vaapi_t *p_va ) free( p_va->p_surface ); /* */ - p_va->image.image_id = VA_INVALID_SURFACE; + p_va->image.image_id = VA_INVALID_ID; p_va->i_context_id = VA_INVALID_ID; p_va->p_surface = NULL; p_va->i_surface_width = 0; @@ -212,7 +213,7 @@ static int CreateSurfaces( vlc_va_vaapi_t *p_va, void **pp_hw_ctx, vlc_fourcc_t p_va->p_surface = calloc( p_va->i_surface_count, sizeof(*p_va->p_surface) ); if( !p_va->p_surface ) return VLC_EGENERIC; - p_va->image.image_id = VA_INVALID_SURFACE; + p_va->image.image_id = VA_INVALID_ID; p_va->i_context_id = VA_INVALID_ID; /* Create surfaces */ @@ -265,7 +266,7 @@ static int CreateSurfaces( vlc_va_vaapi_t *p_va, void **pp_hw_ctx, vlc_fourcc_t { if( vaCreateImage( p_va->p_display, &p_fmt[i], i_width, i_height, &p_va->image ) ) { - p_va->image.image_id = VA_INVALID_SURFACE; + p_va->image.image_id = VA_INVALID_ID; continue; } /* Validate that vaGetImage works with this format */ @@ -274,7 +275,7 @@ static int CreateSurfaces( vlc_va_vaapi_t *p_va, void **pp_hw_ctx, vlc_fourcc_t p_va->image.image_id) ) { vaDestroyImage( p_va->p_display, p_va->image.image_id ); - p_va->image.image_id = VA_INVALID_SURFACE; + p_va->image.image_id = VA_INVALID_ID; continue; } -- 2.39.2