diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/ffmpeg_decoder.cc | 12 | ||||
| -rw-r--r-- | src/wx/film_editor.cc | 3 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index 60f5bf7f5..09f699543 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -224,7 +224,10 @@ FFmpegDecoder::do_pass () if (r < 0) { if (r != AVERROR_EOF) { - throw DecodeError ("error on av_read_frame"); + /* Maybe we should fail here, but for now we'll just finish off instead */ + char buf[256]; + av_strerror (r, buf, sizeof(buf)); + _film->log()->log (String::compose ("error on av_read_frame (%1) (%2)", buf, r)); } /* Get any remaining frames */ @@ -259,7 +262,12 @@ FFmpegDecoder::do_pass () if (_packet.stream_index == _video_stream) { int frame_finished; - if (avcodec_decode_video2 (_video_codec_context, _frame, &frame_finished, &_packet) >= 0 && frame_finished) { + int const r = avcodec_decode_video2 (_video_codec_context, _frame, &frame_finished, &_packet); + if (r >= 0 && frame_finished) { + + if (r != _packet.size) { + _film->log()->log (String::compose ("Used only %1 bytes of %2 in packet", r, _packet.size)); + } /* Where we are in the output, in seconds */ double const out_pts_seconds = video_frame_index() / frames_per_second(); diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index 3e5308a39..f8e914f20 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -655,7 +655,6 @@ FilmEditor::set_things_sensitive (bool s) _scaler->Enable (s); _audio_stream->Enable (s); _dcp_content_type->Enable (s); - _dcp_range->Enable (s); _change_dcp_range_button->Enable (s); _dcp_ab->Enable (s); _audio_gain->Enable (s); @@ -666,8 +665,6 @@ FilmEditor::set_things_sensitive (bool s) _with_subtitles->Enable (s); _subtitle_offset->Enable (s); _subtitle_scale->Enable (s); - _frames_per_second->Enable (s); - _original_size->Enable (s); } /** Called when the `Edit filters' button has been clicked */ |