From 153153f2b91297ed463d0a0a85b74bc38f660003 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 8 Nov 2024 19:56:35 +0100
Subject: Remove out-of-date comment.

---
 src/lib/ffmpeg_examiner.cc | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/lib')

diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc
index 3de1be888..1aeda6a2f 100644
--- a/src/lib/ffmpeg_examiner.cc
+++ b/src/lib/ffmpeg_examiner.cc
@@ -99,7 +99,6 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c, shared_ptr<Jo
 	}
 
 	if (has_video ()) {
-		/* See if the header has duration information in it */
 		_video_length = _need_length ? 0 : llrint((double (_format_context->duration) / AV_TIME_BASE) * video_frame_rate().get());
 	}
 
-- 
cgit v1.2.3


From 111acef9b225731c99274d82cdd374acc04ca252 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 8 Nov 2024 19:57:04 +0100
Subject: I think carry_on_audio should also be set false if audio_packet()
 returns false.

---
 src/lib/ffmpeg_examiner.cc | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc
index 1aeda6a2f..5353ddd2b 100644
--- a/src/lib/ffmpeg_examiner.cc
+++ b/src/lib/ffmpeg_examiner.cc
@@ -159,9 +159,7 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c, shared_ptr<Jo
 		}
 
 		if (audio_stream_index) {
-			if (audio_packet(context, _audio_streams[*audio_stream_index], packet)) {
-				carry_on_audio[*audio_stream_index] = true;
-			}
+			carry_on_audio[*audio_stream_index] = audio_packet(context, _audio_streams[*audio_stream_index], packet);
 		}
 
 		av_packet_free (&packet);
-- 
cgit v1.2.3


From 247191469093427b05229bd0051c25395a30f4b5 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sat, 9 Nov 2024 12:55:41 +0100
Subject: Fix examination logic.

Before we would stop if there was one audio stream and the first packet
was from that stream; we would not carry on to find the video.
---
 src/lib/ffmpeg_examiner.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc
index 5353ddd2b..f5610f502 100644
--- a/src/lib/ffmpeg_examiner.cc
+++ b/src/lib/ffmpeg_examiner.cc
@@ -119,8 +119,8 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c, shared_ptr<Jo
 	 * and a string seems a reasonably neat way to do that.
 	 */
 	string temporal_reference;
-	bool carry_on_video = false;
-	std::vector<bool> carry_on_audio(_audio_streams.size());
+	bool carry_on_video = has_video();
+	std::vector<bool> carry_on_audio(_audio_streams.size(), true);
 	while (true) {
 		auto packet = av_packet_alloc ();
 		DCPOMATIC_ASSERT (packet);
-- 
cgit v1.2.3