X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.cc;h=6383fe58b6736a56c67c696c085c146383517c99;hp=20fe7776bd9aafb80ca12c0fbd035875c0551aaf;hb=HEAD;hpb=b4a306418f70cd0f43f1b91a9bb96b1714c0fa25

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 20fe7776b..4a7c87b34 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -295,8 +295,10 @@ FFmpegContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
 					_filters.push_back(*Filter::from_id("hflip"));
 				} else if (fabs (rot - 90) < 1.0) {
 					_filters.push_back(*Filter::from_id("90clock"));
+					video->rotate_size();
 				} else if (fabs (rot - 270) < 1.0) {
 					_filters.push_back(*Filter::from_id("90anticlock"));
+					video->rotate_size();
 				}
 			}
 			if (examiner->has_alpha()) {
@@ -521,7 +523,7 @@ FFmpegContent::set_default_colour_conversion ()
 		video->set_colour_conversion (PresetColourConversion::from_id ("rec2020").conversion);
 		break;
 	default:
-		if (s.width < 1080) {
+		if (s && s->width < 1080) {
 			video->set_colour_conversion (PresetColourConversion::from_id ("rec601").conversion);
 		} else {
 			video->set_colour_conversion (PresetColourConversion::from_id ("rec709").conversion);