Minor cleanup after last commit.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7309 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/libhb/common.h b/libhb/common.h
index 76bff6a2ece836296f585afe6b9ebb4758baff50..14faa31fd6aee2a9a791238405ee74cf03b36178 100644 (file)
--- a/libhb/common.h
+++ b/libhb/common.h
@@ -59,6 +59,8 @@
 #define MAX( a, b ) ( (a) > (b) ? (a) : (b) )
 #endif
 
+#define HB_ALIGN(x, a) (((x)+(a)-1)&~((a)-1))
+
 #ifndef HB_DEBUG_ASSERT
 #define HB_DEBUG_ASSERT(x, y) { if ((x)) { hb_error("ASSERT: %s", y); exit(1); } }
 #endif
@@ -70,8 +72,6 @@
 
 #define HB_DVD_READ_BUFFER_SIZE 2048
 
-#define HBALIGN(x, a) (((x)+(a)-1)&~((a)-1))
-
 typedef struct hb_handle_s hb_handle_t;
 typedef struct hb_hwd_s hb_hwd_t;
 typedef struct hb_list_s hb_list_t;

diff --git a/libhb/vadxva2.c b/libhb/vadxva2.c
index 3c1dc0cf34b91aa4198849144bd1bdbf43c5e22f..7ca965d3c760d06c6642c62b66c895e3de6d3133 100644 (file)
--- a/libhb/vadxva2.c
+++ b/libhb/vadxva2.c
@@ -148,8 +148,8 @@ static int hb_dx_create_video_decoder( hb_va_dxva2_t *dxva2, int codec_id, const
             break;
     }
     
-    dxva2->surface_width = HBALIGN(fmt->geometry.width, surface_alignment);
-    dxva2->surface_height = HBALIGN(fmt->geometry.height, surface_alignment);    
+    dxva2->surface_width  = HB_ALIGN(fmt->geometry.width,  surface_alignment);
+    dxva2->surface_height = HB_ALIGN(fmt->geometry.height, surface_alignment);
     
     LPDIRECT3DSURFACE9 surface_list[VA_DXVA2_MAX_SURFACE_COUNT];
     if( FAILED( IDirectXVideoDecoderService_CreateSurface( dxva2->vs,