summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2015-05-13 23:36:33 +0000
committerjstebbins <[email protected]>2015-05-13 23:36:33 +0000
commite80199e90bed90b5b6a171da46e4591abd2e25db (patch)
tree852c701a30c35f365885e62ebd2ef2e2d3e18179
parent38974a047e4602615297c8b3f4579b3189f84af9 (diff)
cli: fix initialization of encode ranges
The default chapter start or end was used if one but not the other of start-at/stop-at were used. Also don't overwrite current pass and pass_count status in hb_state_t while searching for the position to start encoding. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7177 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--libhb/sync.c2
-rw-r--r--test/test.c4
2 files changed, 6 insertions, 0 deletions
diff --git a/libhb/sync.c b/libhb/sync.c
index 594251b0d..3c2a7ffbd 100644
--- a/libhb/sync.c
+++ b/libhb/sync.c
@@ -1655,6 +1655,8 @@ static void UpdateSearchState( hb_work_object_t * w, int64_t start )
return;
}
+ hb_get_state2(pv->job->h, &state);
+
#define p state.param.working
state.state = HB_STATE_SEARCHING;
if ( pv->job->frame_to_start )
diff --git a/test/test.c b/test/test.c
index 2a01f32e0..1026eae93 100644
--- a/test/test.c
+++ b/test/test.c
@@ -3662,8 +3662,12 @@ PrepareJob(hb_handle_t *h, hb_title_t *title, hb_dict_t *preset_dict)
hb_dict_set(range_dict, "Type", hb_value_string(range_type));
if (range_start)
hb_dict_set(range_dict, "Start", hb_value_int(range_start));
+ else
+ hb_dict_remove(range_dict, "Start");
if (range_end)
hb_dict_set(range_dict, "End", hb_value_int(range_end));
+ else
+ hb_dict_remove(range_dict, "End");
if (range_seek_points)
hb_dict_set(range_dict, "SeekPoints",
hb_value_int(range_seek_points));