From: Carl Hetherington <cth@carlh.net>
Date: Fri, 29 Mar 2024 22:23:10 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/main' into v2.17.x
X-Git-Tag: v2.17.15~2
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=a115088ca904a26d100e479a7fde21c9235bf7c9

Merge remote-tracking branch 'origin/main' into v2.17.x
---

a115088ca904a26d100e479a7fde21c9235bf7c9
diff --cc src/lib/ffmpeg_examiner.cc
index 583ea1297,787198e4a..f7d3f9df3
--- a/src/lib/ffmpeg_examiner.cc
+++ b/src/lib/ffmpeg_examiner.cc
@@@ -173,8 -181,8 +173,6 @@@ FFmpegExaminer::FFmpegExaminer (shared_
  		/* This code taken from get_rotation() in ffmpeg:cmdutils.c */
  		auto stream = _format_context->streams[*_video_stream];
  		auto rotate_tag = av_dict_get (stream->metadata, "rotate", 0, 0);
- 		_rotation = 0;
 -		uint8_t* displaymatrix = av_stream_get_side_data (stream, AV_PKT_DATA_DISPLAYMATRIX, 0);
--
  		if (rotate_tag && *rotate_tag->value && strcmp(rotate_tag->value, "0")) {
  			char *tail;
  			_rotation = av_strtod (rotate_tag->value, &tail);