diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | src/lib/ffmpeg_decoder.cc | 2 | ||||
| -rw-r--r-- | src/lib/subtitle.cc | 2 | ||||
| -rw-r--r-- | src/wx/film_viewer.cc | 4 |
4 files changed, 13 insertions, 4 deletions
@@ -1,3 +1,12 @@ +2012-12-18 Carl Hetherington <cth@carlh.net> + + * Alter film viewer so that it is much quicker, responds instantly + to changes in video filtering settings, and can (roughly) play the + source material back. + + * Make the examination of content for length optional, so that + if a source file has an accurate header you can trust it. + 2012-12-13 Carl Hetherington <cth@carlh.net> * Version 0.64 released. diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index 97d43c76c..c4ca00fa6 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -411,7 +411,7 @@ FFmpegDecoder::deinterleave_audio (uint8_t* data, int size) break; default: - assert (false); + throw DecodeError (String::compose ("Unrecognised audio sample format (%1)", static_cast<int> (audio_sample_format()))); } return audio; diff --git a/src/lib/subtitle.cc b/src/lib/subtitle.cc index 182e30ed3..c52d3ac66 100644 --- a/src/lib/subtitle.cc +++ b/src/lib/subtitle.cc @@ -139,7 +139,7 @@ subtitle_transformed_area ( return tx; } -/** @return area that this subtitle take up, in the original uncropped source's coordinate space */ +/** @return area that this subtitle takes up, in the original uncropped source's coordinate space */ Rect Subtitle::area () const { diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 650bf7216..f4ad700ad 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -185,7 +185,7 @@ FilmViewer::paint_panel (wxPaintEvent& ev) { wxPaintDC dc (_panel); - if (!_display_frame || !_film) { + if (!_display_frame || !_film || !_out_width || !_out_height) { dc.Clear (); return; } @@ -243,7 +243,7 @@ FilmViewer::update_from_raw () void FilmViewer::raw_to_display () { - if (!_raw_frame || !_out_width || !_out_height || !_film) { + if (!_raw_frame || _out_width < 64 || _out_height < 64 || !_film) { return; } |