summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/lib/ffmpeg_decoder.cc2
-rw-r--r--src/lib/subtitle.cc2
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
{