diff options
| author | Rodeo <[email protected]> | 2013-11-08 21:21:02 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2013-11-08 21:21:02 +0000 |
| commit | 43f0bc9d538c86ea75a5cd627a81452e9d76b825 (patch) | |
| tree | a6bde5c2174543e4ea282ab26b6a2c76829105eb /libhb/vadxva2.c | |
| parent | d0a2953efbce340e34a971b9481024a51ae52383 (diff) | |
OpenCL: use the new library loading architecture for all OpenCL code.
An OpenCL SDK is no longer needed to build OpenCL support.
Note: as a result, the --enable-opencl configure option is removed.
Also, libOpenCL is no longer needed to run the application (it is still necessary to use OpenCL features, of course).
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5886 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/vadxva2.c')
| -rw-r--r-- | libhb/vadxva2.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/libhb/vadxva2.c b/libhb/vadxva2.c index 98ff41dcc..d173d4a08 100644 --- a/libhb/vadxva2.c +++ b/libhb/vadxva2.c @@ -10,14 +10,12 @@ Li Cao <[email protected]> <http://www.multicorewareinc.com/> */ -#include "vadxva2.h" -#ifdef USE_OPENCL +#ifdef USE_HWD + +#include "vadxva2.h" #include "extras/cl.h" #include "oclnv12toyuv.h" -#endif - -#ifdef USE_HWD static int hb_va_setup( hb_va_dxva2_t *dxva2, void **hw, int width, int height ); static int hb_va_get( hb_va_dxva2_t *dxva2, AVFrame *frame ); @@ -112,12 +110,11 @@ void hb_va_close( hb_va_dxva2_t *dxva2 ) if( dxva2->hd3d9_dll ) FreeLibrary( dxva2->hd3d9_dll ); -#ifdef USE_OPENCL if ( dxva2->nv12toyuv_tmp_in ) free( dxva2->nv12toyuv_tmp_in ); if ( dxva2->nv12toyuv_tmp_out ) free( dxva2->nv12toyuv_tmp_out ); -#endif + dxva2->description = NULL; free( dxva2 ); } @@ -775,4 +772,5 @@ int hb_check_hwd_fmt( int fmt ) } return result; } -#endif + +#endif // USE_HWD |