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 /test/test.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 'test/test.c')
| -rw-r--r-- | test/test.c | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/test/test.c b/test/test.c index 1b1bb14ef..f3eba7c48 100644 --- a/test/test.c +++ b/test/test.c @@ -260,10 +260,7 @@ int main( int argc, char ** argv ) /* Init libhb */ h = hb_init( debug, update ); hb_dvd_set_dvdnav( dvdnav ); -#ifdef USE_OPENCL - if( use_opencl ) - hb_get_opencl_env(); -#endif + /* Show version */ fprintf( stderr, "%s - %s - %s\n", HB_PROJECT_TITLE, HB_PROJECT_BUILD_TITLE, HB_PROJECT_URL_WEBSITE ); @@ -481,20 +478,12 @@ static void PrintTitleInfo( hb_title_t * title, int feature ) fprintf( stderr, " + autocrop: %d/%d/%d/%d\n", title->crop[0], title->crop[1], title->crop[2], title->crop[3] ); - fprintf( stderr, " + support opencl: %s\n", -#ifdef USE_OPENCL - title->opencl_support ? "yes" : "no" -#else - "not built-in" -#endif - ); - fprintf( stderr, " + support hwd: %s\n", + fprintf(stderr, " + support opencl: %s\n", title->opencl_support ? "yes" : "no"); #ifdef USE_HWD - title->hwd_support ? "yes" : "no" + fprintf(stderr, " + support hwd: %s\n", title->hwd_support ? "yes" : "no"); #else - "not built-in" + fprintf(stderr, " + support hwd: not built-in\n"); #endif - ); fprintf( stderr, " + chapters:\n" ); for( i = 0; i < hb_list_count( title->list_chapter ); i++ ) @@ -2877,11 +2866,10 @@ static int HandleEvents( hb_handle_t * h ) job->frame_to_start = start_at_frame; subtitle_scan = 0; } -#ifdef USE_OPENCL + + /* OpenCL */ job->use_opencl = use_opencl; -#else - job->use_opencl = 0; -#endif + if( subtitle_scan ) { /* |