diff options
| author | jstebbins <[email protected]> | 2010-04-10 01:10:15 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2010-04-10 01:10:15 +0000 |
| commit | c6c3b33558aa505e6c44c988154ab253a895d1e3 (patch) | |
| tree | 5c0641a9c5f962b52a49e8c079e38d88f86500f5 /libhb/hb.c | |
| parent | 34d7b7d5daef1d22ab8061ebb46fea5a27a4c8fd (diff) | |
fix some mingw warnings and a mingw build issue
mingw gcc-4.5 has linker issues against shared libstdc++
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3217 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/hb.c')
| -rw-r--r-- | libhb/hb.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libhb/hb.c b/libhb/hb.c index 8e53a7a51..30fce039c 100644 --- a/libhb/hb.c +++ b/libhb/hb.c @@ -1,6 +1,10 @@ #include "hb.h" #include "hbffmpeg.h" +#if defined( SYS_MINGW ) && defined( PTW32_STATIC_LIB ) +#include <pthread.h> +#endif + struct hb_handle_s { int id; @@ -145,11 +149,9 @@ hb_handle_t * hb_init( int verbose, int update_check ) { if (!hb_process_initialized) { -#ifdef USE_PTHREAD -#if defined( _WIN32 ) || defined( __MINGW32__ ) +#if defined( SYS_MINGW ) && defined( PTW32_STATIC_LIB ) pthread_win32_process_attach_np(); #endif -#endif hb_process_initialized =1; } @@ -680,13 +682,13 @@ int hb_detect_comb( hb_buffer_t * buf, int width, int height, int color_equal, i if( average_cc > threshold ) { #if 0 - hb_log("Average %i combed (Threshold %i) %i/%i/%i | PTS: %lld (%fs) %s", average_cc, threshold, cc[0], cc[1], cc[2], buf->start, (float)buf->start / 90000, (buf->flags & 16) ? "Film" : "Video" ); + hb_log("Average %i combed (Threshold %i) %i/%i/%i | PTS: %"PRId64" (%fs) %s", average_cc, threshold, cc[0], cc[1], cc[2], buf->start, (float)buf->start / 90000, (buf->flags & 16) ? "Film" : "Video" ); #endif return 1; } #if 0 - hb_log("SKIPPED Average %i combed (Threshold %i) %i/%i/%i | PTS: %lld (%fs) %s", average_cc, threshold, cc[0], cc[1], cc[2], buf->start, (float)buf->start / 90000, (buf->flags & 16) ? "Film" : "Video" ); + hb_log("SKIPPED Average %i combed (Threshold %i) %i/%i/%i | PTS: %"PRId64" (%fs) %s", average_cc, threshold, cc[0], cc[1], cc[2], buf->start, (float)buf->start / 90000, (buf->flags & 16) ? "Film" : "Video" ); #endif /* Reaching this point means no combing detected. */ |