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

diff --cc src/lib/ffmpeg_content.cc
Simple merge

diff --cc src/lib/ffmpeg_examiner.cc
index 583ea129725eadee1e09e162bcacb3d00ffaf401,787198e4a477417570880bfdfe11bc8322ccf017..f7d3f9df334b8d92f00c93adc456c08b587cec30
--- 1/src/lib/ffmpeg_examiner.cc
--- 2/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);

diff --cc src/lib/video_content.cc
Simple merge

diff --cc src/lib/video_content.h
Simple merge

diff --cc wscript
Simple merge