[vlc-commits] commit: Used VA_INVALID_ID when appropriate. (Laurent Aimar )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Laurent Aimar <fenrir at videolan.org> | Sun Jul 11 18:53:05 2010 +0200| [278fd01643906dc901858a3e1a20fbc99576772c] | committer: Rémi Duraffort 

Used VA_INVALID_ID when appropriate.
(cherry picked from commit 3683cc99da0a39bca72d14a17682ffeacee7652b)

Signed-off-by: Rémi Duraffort <ivoire at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=278fd01643906dc901858a3e1a20fbc99576772c
---

 modules/codec/avcodec/vaapi.c |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/modules/codec/avcodec/vaapi.c b/modules/codec/avcodec/vaapi.c
index 5f83d37..84120a0 100644
--- a/modules/codec/avcodec/vaapi.c
+++ b/modules/codec/avcodec/vaapi.c
@@ -128,6 +128,8 @@ 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;
 
     /* Create a VA display */
     p_va->p_display_x11 = XOpenDisplay(NULL);
@@ -155,7 +157,7 @@ static int Open( vlc_va_vaapi_t *p_va, int i_codec_id )
     if( vaCreateConfig( p_va->p_display,
                         i_profile, VAEntrypointVLD, &attrib, 1, &p_va->i_config_id ) )
     {
-        p_va->i_config_id = 0;
+        p_va->i_config_id = VA_INVALID_ID;
         goto error;
     }
 
@@ -179,7 +181,7 @@ static void DestroySurfaces( vlc_va_vaapi_t *p_va )
         vaDestroyImage( p_va->p_display, p_va->image.image_id );
     }
 
-    if( p_va->i_context_id )
+    if( p_va->i_context_id != VA_INVALID_ID )
         vaDestroyContext( p_va->p_display, p_va->i_context_id );
 
     for( int i = 0; i < p_va->i_surface_count && p_va->p_surface; i++ )
@@ -193,7 +195,7 @@ static void DestroySurfaces( vlc_va_vaapi_t *p_va )
 
     /* */
     p_va->image.image_id = VA_INVALID_SURFACE;
-    p_va->i_context_id = 0;
+    p_va->i_context_id = VA_INVALID_ID;
     p_va->p_surface = NULL;
     p_va->i_surface_width = 0;
     p_va->i_surface_height = 0;
@@ -208,6 +210,7 @@ static int CreateSurfaces( vlc_va_vaapi_t *p_va, void **pp_hw_ctx, vlc_fourcc_t
     if( !p_va->p_surface )
         return VLC_EGENERIC;
     p_va->image.image_id = VA_INVALID_SURFACE;
+    p_va->i_context_id   = VA_INVALID_ID;
 
     /* Create surfaces */
     VASurfaceID pi_surface_id[p_va->i_surface_count];
@@ -233,7 +236,7 @@ static int CreateSurfaces( vlc_va_vaapi_t *p_va, void **pp_hw_ctx, vlc_fourcc_t
                          i_width, i_height, VA_PROGRESSIVE,
                          pi_surface_id, p_va->i_surface_count, &p_va->i_context_id ) )
     {
-        p_va->i_context_id = 0;
+        p_va->i_context_id = VA_INVALID_ID;
         goto error;
     }
 
@@ -453,7 +456,7 @@ static void Close( vlc_va_vaapi_t *p_va )
     if( p_va->i_surface_width || p_va->i_surface_height )
         DestroySurfaces( p_va );
 
-    if( p_va->i_config_id )
+    if( p_va->i_config_id != VA_INVALID_ID )
         vaDestroyConfig( p_va->p_display, p_va->i_config_id );
     if( p_va->p_display )
         vaTerminate( p_va->p_display );