[vlc-commits] commit: use VA_INVALID_ID wherever appropriate (vaapi). (gbeauchesne@ splitted-desktop.com )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | gbeauchesne at splitted-desktop.com <gbeauchesne at splitted-desktop.com> | Sun Jul 11 23:33:13 2010 +0200| [34a2451dae25c8d15f0382a18b90f2f707363605] | committer: Rémi Duraffort 

use VA_INVALID_ID wherever appropriate (vaapi).

Signed-off-by: Laurent Aimar <fenrir at videolan.org>
(cherry picked from commit a4f30ff9f74a205f9ad39fd5c76fbda32d064771)

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

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

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

diff --git a/modules/codec/avcodec/vaapi.c b/modules/codec/avcodec/vaapi.c
index 84120a0..8b56967 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 */
     p_va->p_display_x11 = XOpenDisplay(NULL);
@@ -175,7 +176,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 );
@@ -194,7 +195,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;
@@ -209,7 +210,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 */
@@ -262,7 +263,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 */
@@ -271,7 +272,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;
             }