diff options
| author | Rodeo <[email protected]> | 2013-08-26 00:12:11 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2013-08-26 00:12:11 +0000 |
| commit | 15360796b3cf3e4b581a71b4e875d7cba9c62903 (patch) | |
| tree | 0c9ad329386f825d165bc00c237ec1cee2b8a528 /libhb | |
| parent | 500769514ab543f122e59b0288af5c4ecfa95053 (diff) | |
Print QSV info in all logs in a libhb-friendly manner, via hb_scan (was printed in hb_init).
Also, print an error to the log if attempting to print uninitialized QSV info.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5751 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb')
| -rw-r--r-- | libhb/hb.c | 10 | ||||
| -rw-r--r-- | libhb/qsv_common.c | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/libhb/hb.c b/libhb/hb.c index 629b2e3a3..a9d9e417b 100644 --- a/libhb/hb.c +++ b/libhb/hb.c @@ -440,11 +440,6 @@ hb_handle_t * hb_init( int verbose, int update_check ) h->interjob = calloc( sizeof( hb_interjob_t ), 1 ); -#ifdef USE_QSV - /* Intel Quick Sync Video */ - hb_qsv_info_print(); -#endif - /* Start library thread */ hb_log( "hb_init: starting libhb thread" ); h->die = 0; @@ -620,6 +615,11 @@ void hb_scan( hb_handle_t * h, const char * path, int title_index, hb_title_close( &title ); } +#ifdef USE_QSV + /* Print QSV info here so that it's in all scan and encode logs */ + hb_qsv_info_print(); +#endif + /* Print CPU info here so that it's in all scan and encode logs */ hb_log("hb_scan: CPU count: %i", hb_get_cpu_count()); if (hb_get_cpu_name() != NULL) diff --git a/libhb/qsv_common.c b/libhb/qsv_common.c index 6028331cb..99c1536e2 100644 --- a/libhb/qsv_common.c +++ b/libhb/qsv_common.c @@ -127,7 +127,9 @@ int hb_qsv_info_init() void hb_qsv_info_print() { if (hb_qsv_info == NULL) - return; + { + hb_error("hb_qsv_info_print: QSV info not initialized!"); + } // is QSV available? hb_log("Intel Quick Sync Video support: %s", |