diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-12-16 13:26:45 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-12-16 13:26:45 +0000 |
| commit | 1f2bc4d8f3601ad1e12b94f37b3889fcd003509b (patch) | |
| tree | f192579eda6eaaea73a3b17acd2bb19965ae331f /src/lib/ffmpeg_decoder.cc | |
| parent | 0813034d7193dc8869126d13a9d12d2c4d1e6c14 (diff) | |
Split Options into encode / decode.
Diffstat (limited to 'src/lib/ffmpeg_decoder.cc')
| -rw-r--r-- | src/lib/ffmpeg_decoder.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index 7b97a422e..b3b1acbbb 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -59,7 +59,7 @@ using boost::shared_ptr; using boost::optional; using boost::dynamic_pointer_cast; -FFmpegDecoder::FFmpegDecoder (shared_ptr<Film> f, shared_ptr<const Options> o, Job* j) +FFmpegDecoder::FFmpegDecoder (shared_ptr<Film> f, shared_ptr<const DecodeOptions> o, Job* j) : Decoder (f, o, j) , VideoDecoder (f, o, j) , AudioDecoder (f, o, j) @@ -270,7 +270,7 @@ FFmpegDecoder::pass () _film->log()->log (String::compose ("Used only %1 bytes of %2 in packet", r, _packet.size)); } - if (_opt->decoder_alignment) { + if (_opt->video_sync) { out_careful (); } else { filter_and_emit_video (_frame); |