diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-11-04 02:27:43 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-11-04 02:27:43 +0000 |
| commit | b4dd5979b6c1d48b0af4fefd9d1df4e9947da402 (patch) | |
| tree | ea11bd9fd3aefd258855430594dbe8e2d5e9f748 | |
| parent | e193babcec6a26bc1ee83d99d009bd5a3751a5bc (diff) | |
Fix bugs caught by tests.
| -rw-r--r-- | src/lib/decoder.cc | 2 | ||||
| -rw-r--r-- | test/metadata.ref | 4 | ||||
| -rw-r--r-- | test/test.cc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc index 6da45a788..783d54010 100644 --- a/src/lib/decoder.cc +++ b/src/lib/decoder.cc @@ -251,7 +251,7 @@ Decoder::emit_audio (uint8_t* data, int size) void Decoder::process_video (AVFrame* frame) { - assert (_film->length()); + assert (_ignore_length || _film->length()); if (_minimal) { ++_video_frame_index; diff --git a/test/metadata.ref b/test/metadata.ref index 652867ce0..8276d59e2 100644 --- a/test/metadata.ref +++ b/test/metadata.ref @@ -10,8 +10,8 @@ bottom_crop 4 filter pphb filter unsharp scaler bicubic -dcp_frames 42 -dcp_trim_action cut +dcp_trim_start 42 +dcp_trim_end 99 dcp_ab 1 selected_audio_stream -1 audio_gain 0 diff --git a/test/test.cc b/test/test.cc index f05c7ad83..742a522fb 100644 --- a/test/test.cc +++ b/test/test.cc @@ -100,7 +100,7 @@ BOOST_AUTO_TEST_CASE (film_metadata_test) f_filters.push_back (Filter::from_id ("unsharp")); f->set_filters (f_filters); f->set_dcp_trim_start (42); - f->set_dcp_trim_start (99); + f->set_dcp_trim_end (99); f->set_dcp_ab (true); f->write_metadata (); |