X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_decoder.cc;h=0e65a6d6b272a67e2f9bdc37bb281f8114684d87;hb=c4403784febdbdd42e9c32e67fadb147f11fe566;hp=3d9e965a9d169ad3e66a014cb3cb4e0d7a750c1b;hpb=ad1ef39eda58b3a919ea3b7084401a0439409ec6;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 3d9e965a9..0e65a6d6b 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -74,6 +74,7 @@ using boost::split;
 using boost::optional;
 using boost::dynamic_pointer_cast;
 using dcp::Size;
+using namespace dcpomatic;
 
 FFmpegDecoder::FFmpegDecoder (shared_ptr<const Film> film, shared_ptr<const FFmpegContent> c, bool fast)
 	: FFmpeg (c)
@@ -377,6 +378,14 @@ FFmpegDecoder::seek (ContentTime time, bool accurate)
 		AVSEEK_FLAG_BACKWARD
 		);
 
+	{
+		/* Force re-creation of filter graphs to reset them and hence to make sure
+		   they don't have any pre-seek frames knocking about.
+		*/
+		boost::mutex::scoped_lock lm (_filter_graphs_mutex);
+		_filter_graphs.clear ();
+	}
+
 	if (video_codec_context ()) {
 		avcodec_flush_buffers (video_codec_context());
 	}
@@ -659,8 +668,19 @@ FFmpegDecoder::decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTime
 		out_p += image->stride()[0] / sizeof (uint32_t);
 	}
 
-	int const target_width = subtitle_codec_context()->width;
-	int const target_height = subtitle_codec_context()->height;
+	int target_width = subtitle_codec_context()->width;
+	if (target_width == 0 && video_codec_context()) {
+		/* subtitle_codec_context()->width == 0 has been seen in the wild but I don't
+		   know if it's supposed to mean something from FFmpeg's point of view.
+		*/
+		target_width = video_codec_context()->width;
+	}
+	int target_height = subtitle_codec_context()->height;
+	if (target_height == 0 && video_codec_context()) {
+		target_height = video_codec_context()->height;
+	}
+	DCPOMATIC_ASSERT (target_width);
+	DCPOMATIC_ASSERT (target_height);
 	dcpomatic::Rect<double> const scaled_rect (
 		static_cast<double> (rect->x) / target_width,
 		static_cast<double> (rect->y) / target_height,