Unverified Commit 991bf1d3 authored by Josh Holmer's avatar Josh Holmer Committed by GitHub

Fix failing build (#928)

PRs #912, #919, and #922 contained changes which conflicted with one
another, and needed to be reconciled in order to get the build to pass
with all of these changes together
parent 6d306b64
......@@ -507,7 +507,7 @@ impl Context {
match self.frame_q.get(&fi.number) {
Some(Some(_)) => {},
_ => { return Err(fi); }
_ => { return (fi, false); }
}
// Now that we know the frame number, look up the correct frame type
......
......@@ -319,7 +319,7 @@ fn encode_decode(
let mut ctx =
setup_encoder(w, h, speed, quantizer, bit_depth, ChromaSampling::Cs420,
min_keyint, max_keyint, low_latency);
ctx.set_frames_to_be_coded(limit as u64);
ctx.set_limit(limit as u64);
println!("Encoding {}x{} speed {} quantizer {}", w, h, speed, quantizer);
......
......@@ -294,7 +294,7 @@ fn encode_decode(
let mut ctx =
setup_encoder(w, h, speed, quantizer, bit_depth, ChromaSampling::Cs420,
min_keyint, max_keyint, low_latency);
ctx.set_frames_to_be_coded(limit as u64);
ctx.set_limit(limit as u64);
println!("Encoding {}x{} speed {} quantizer {}", w, h, speed, quantizer);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment