summaryrefslogtreecommitdiffstats
path: root/libhb/muxavformat.c
diff options
context:
space:
mode:
authorJohn Stebbins <[email protected]>2015-11-03 09:46:28 -0800
committerJohn Stebbins <[email protected]>2015-11-09 11:06:59 -0800
commita986f54a4109bb8c3b2fb57849b4b0ea01e3c522 (patch)
tree7add9d007dc8bdd72114637c8f3f7361621ad4a5 /libhb/muxavformat.c
parent63b340ebc33d57aeda22e340dab48b1df2106541 (diff)
libhb: make muxer, sync, and reader behave like other work objects
simplify job initialization sequence, clean up code, and document dependencies in the sequence better. Make hb_add set job->sequence_id. It is no longer necessary for the frontend to do this. If the frontend needs the sequence_id, it is returned by hb_add(). Clean up use of interjob. do_job() now uses sequence_id to detect when a new sequence of related jobs is running and automatically clears interjob.
Diffstat (limited to 'libhb/muxavformat.c')
-rw-r--r--libhb/muxavformat.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/libhb/muxavformat.c b/libhb/muxavformat.c
index bfa377089..0d7059775 100644
--- a/libhb/muxavformat.c
+++ b/libhb/muxavformat.c
@@ -355,16 +355,7 @@ static int avformatInit( hb_mux_object_t * m )
track->st->codec->height = job->height;
track->st->disposition |= AV_DISPOSITION_DEFAULT;
- hb_rational_t vrate;
- if( job->pass_id == HB_PASS_ENCODE_2ND )
- {
- hb_interjob_t * interjob = hb_interjob_get( job->h );
- vrate = interjob->vrate;
- }
- else
- {
- vrate = job->vrate;
- }
+ hb_rational_t vrate = job->vrate;
// If the vrate is the internal clock rate, there's a good chance
// this is a standard rate that we have in our hb_video_rates table.