X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Frender.c;h=a4943b77649ca20a60be192e30447fc3ac1d596c;hb=033e32de9c380f54c7d1362a3979da205ebc3a29;hp=34928d906b3c5aec62f24b859c93c86855af37a4;hpb=1a315f0b1aa5b1cc17c785f3f14581ed0ca4c7c4;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/libhb/render.c b/libhb/render.c index 34928d90..a4943b77 100644 --- a/libhb/render.c +++ b/libhb/render.c @@ -226,6 +226,7 @@ static hb_buffer_t *delete_buffer_from_chain( hb_buffer_t **buf_out, hb_buffer_t // found 'out' - remove it from the chain pred->next = succ; } + out->next = 0; hb_buffer_close( &out ); return succ; } @@ -493,7 +494,7 @@ int renderWork( hb_work_object_t * w, hb_buffer_t ** buf_in, /* In order to make sure we have continuous time stamps, store the current frame's duration as starting when the last one stopped. */ pv->last_start[0] = pv->last_stop[1]; - pv->last_stop[0] = pv->last_start[0] + (in->stop - in->start); + pv->last_stop[0] = pv->last_start[0] + (buf_tmp_in->stop - buf_tmp_in->start); } /* Apply subtitles */ @@ -673,10 +674,10 @@ void renderClose( hb_work_object_t * w ) /* Preserve dropped frame count for more accurate framerates in 2nd passes. */ interjob->render_dropped = pv->dropped_frames; - hb_log("render: lost time: %lld (%i frames)", pv->total_lost_time, pv->dropped_frames); - hb_log("render: gained time: %lld (%i frames) (%lld not accounted for)", pv->total_gained_time, pv->extended_frames, pv->total_lost_time - pv->total_gained_time); + hb_log("render: lost time: %"PRId64" (%i frames)", pv->total_lost_time, pv->dropped_frames); + hb_log("render: gained time: %"PRId64" (%i frames) (%"PRId64" not accounted for)", pv->total_gained_time, pv->extended_frames, pv->total_lost_time - pv->total_gained_time); if (pv->dropped_frames) - hb_log("render: average dropped frame duration: %lld", (pv->total_lost_time / pv->dropped_frames) ); + hb_log("render: average dropped frame duration: %"PRId64, (pv->total_lost_time / pv->dropped_frames) ); /* Cleanup subtitle queue */ if( pv->subtitle_queue )