disable asserts in libdvdnav except when configured with --debug=max

[handbrake-jp/handbrake-jp-git.git] / libhb / common.h

diff --git a/libhb/common.h b/libhb/common.h
index 57447b0..0c06ba9 100644 (file)
--- a/libhb/common.h
+++ b/libhb/common.h
@@ -166,14 +166,14 @@ struct hb_job_s
     /* Picture settings:
          crop:                must be multiples of 2 (top/bottom/left/right)
          deinterlace:         0 or 1
-         width:               must be a multiple of 16
-         height:              must be a multiple of 16
+         width:               must be a multiple of 2
+         height:              must be a multiple of 2
          keep_ratio:          used by UIs
          grayscale:           black and white encoding
          pixel_ratio:         store pixel aspect ratio in the video
          pixel_aspect_width:  numerator for pixel aspect ratio
          pixel_aspect_height: denominator for pixel aspect ratio
-         modulus:             set a number besides 16 for dimensions to be multiples of
+         modulus:             set a number for dimensions to be multiples of
          maxWidth:            keep width below this
          maxHeight:           keep height below this */
     int             crop[4];
@@ -187,7 +187,6 @@ struct hb_job_s
     struct
     {
         int             mode;
-        int             modulus;
         int             itu_par;
         int             par_width;
         int             par_height;
@@ -195,7 +194,8 @@ struct hb_job_s
         int             dar_height;
         int             keep_display_aspect;
     } anamorphic;
-    
+
+    int             modulus;
     int             maxWidth;
     int             maxHeight;
 
@@ -260,7 +260,10 @@ struct hb_job_s
     hb_subtitle_config_t    select_subtitle_config;
 
     int             angle;              // dvd angle to encode
-    int             frame_to_stop;       // declare eof when we hit this frame
+    int             frame_to_start;     // declare eof when we hit this frame
+    int64_t         pts_to_start;       // drop frames until  we pass this pts 
+                                        //  in the time-linearized input stream
+    int             frame_to_stop;      // declare eof when we hit this frame
     int64_t         pts_to_stop;        // declare eof when we pass this pts in
                                         //  the time-linearized input stream
     int             start_at_preview;   // if non-zero, encoding will start
@@ -566,6 +569,7 @@ struct hb_state_s
 #define HB_STATE_PAUSED   16
 #define HB_STATE_WORKDONE 32
 #define HB_STATE_MUXING   64
+#define HB_STATE_SEARCHING 128
     int state;
 
     union