X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;ds=sidebyside;f=libhb%2Fcommon.h;h=b6c5e5714ccb366be63606b64296fdb7c4779263;hb=033e32de9c380f54c7d1362a3979da205ebc3a29;hp=808714ee7b5a7e968eba5c26d996fe7108f922a8;hpb=d6a4ae73b86cca10f2342c9e26c132855cad6356;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/libhb/common.h b/libhb/common.h
index 808714ee..b6c5e571 100644
--- a/libhb/common.h
+++ b/libhb/common.h
@@ -18,6 +18,12 @@
 #include <sys/stat.h>
 #include <dirent.h>
 
+#if defined( __GNUC__ ) && !(defined( _WIN32 ) || defined( __MINGW32__ ))
+#   define HB_WPRINTF(s,v) __attribute__((format(printf,s,v)))
+#else
+#   define HB_WPRINTF(s,v)
+#endif
+
 #if defined( SYS_MINGW )
 #   define fseek fseeko64
 #   define ftell ftello64
@@ -203,7 +209,6 @@ struct hb_job_s
          cfr:               0 (vfr), 1 (cfr), 2 (pfr) [see render.c]
          pass:              0, 1 or 2 (or -1 for scan)
          h264_level:        vestigial boolean to decide if we're encoding for iPod
-         crf:               boolean for whether to use constant rate factor with x264
          x264opts:          string of extra x264 options
          areBframes:        boolean to note if b-frames are included in x264opts */
 #define HB_VCODEC_MASK   0x0000FF
@@ -221,7 +226,6 @@ struct hb_job_s
     int             pass;
     int             h264_13;
     int             h264_level;
-    int             crf;
     char            *x264opts;
     int             areBframes;
     int             color_matrix;
@@ -273,6 +277,9 @@ struct hb_job_s
     volatile int  * die;
     volatile int    done;
 
+    uint64_t        st_pause_date;
+    uint64_t        st_paused;
+
     hb_fifo_t     * fifo_mpeg2;   /* MPEG-2 video ES */
     hb_fifo_t     * fifo_raw;     /* Raw pictures */
     hb_fifo_t     * fifo_sync;    /* Raw pictures, framerate corrected */