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

[git at videolan.org]

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

Used VA_INVALID_SURFACE when appropriate.
(cherry picked from commit 7b27f950b0fe4c76acbea58ea183a486bdc7da2e)

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

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

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

diff --git a/modules/codec/avcodec/vaapi.c b/modules/codec/avcodec/vaapi.c
index f9a64b7..5f83d37 100644
--- a/modules/codec/avcodec/vaapi.c
+++ b/modules/codec/avcodec/vaapi.c
@@ -173,7 +173,7 @@ error:
 
 static void DestroySurfaces( vlc_va_vaapi_t *p_va )
 {
-    if( p_va->image.image_id )
+    if( p_va->image.image_id != VA_INVALID_SURFACE )
     {
         CopyCleanCache( &p_va->image_cache );
         vaDestroyImage( p_va->p_display, p_va->image.image_id );
@@ -192,7 +192,7 @@ static void DestroySurfaces( vlc_va_vaapi_t *p_va )
     free( p_va->p_surface );
 
     /* */
-    p_va->image.image_id = 0;
+    p_va->image.image_id = VA_INVALID_SURFACE;
     p_va->i_context_id = 0;
     p_va->p_surface = NULL;
     p_va->i_surface_width = 0;
@@ -207,6 +207,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;
 
     /* Create surfaces */
     VASurfaceID pi_surface_id[p_va->i_surface_count];
@@ -258,7 +259,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 = 0;
+                p_va->image.image_id = VA_INVALID_SURFACE;
                 continue;
             }
             /* Validate that vaGetImage works with this format */
@@ -267,7 +268,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 = 0;
+                p_va->image.image_id = VA_INVALID_SURFACE;
                 continue;
             }