Merge branch 'master' into video-player

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index a05b331cce32ae84947115813543748f0af327ca..0e4446a86a7eada515115b22f8e5b80277edf5ca 100644 (file)
--- 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 4b7f81947f66480401b8cde3b6387bf31a117b80..39f8faa6827fc8430155a186e39decbbbc8a24a6 100644 (file)
--- 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
 {