diff options
| author | Rodeo <[email protected]> | 2015-06-23 16:27:04 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2015-06-23 16:27:04 +0000 |
| commit | 110c304ff2113e5852a35174a7d51ffe5297483b (patch) | |
| tree | 063bcfe563d4d1512be10e8fbd0d814e85ddfe2c | |
| parent | a94ce281bb6883ea3d3cb11a20d8879e9c3675d2 (diff) | |
Minor cleanup after last commit.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7309 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | libhb/common.h | 4 | ||||
| -rw-r--r-- | libhb/vadxva2.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libhb/common.h b/libhb/common.h index 76bff6a2e..14faa31fd 100644 --- 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 3c1dc0cf3..7ca965d3c 100644 --- 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, |