diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-12-18 19:32:48 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-12-18 19:32:48 +0000 |
| commit | 2587f29e54bac098296dbef6557b9bf9bcdc2406 (patch) | |
| tree | f934cfc55d101e1ea939be999fc31f661b08ca43 /src/lib | |
| parent | 8a1b1aca4862b62862e6b523998e328ec2889d30 (diff) | |
| parent | a54bdb873641bbc84298f4424dba17a075d0c0da (diff) | |
Merge branch 'master' into video-player
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/ffmpeg_decoder.cc | 2 | ||||
| -rw-r--r-- | src/lib/subtitle.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index a05b331cc..0e4446a86 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 4b7f81947..39f8faa68 100644 --- a/src/lib/subtitle.cc +++ b/src/lib/subtitle.cc @@ -138,7 +138,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 { |