Movies: Do not decode the audiostream if an external movie audio is p…

…laying Fix regression introduced by b6bf503
julianxhokaxhiu · Sep 4, 2023 · e0277ce · e0277ce
1 parent b802489
commit e0277ce
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -2,6 +2,10 @@
 
 - Full commit list since last stable release: https://github.com/julianxhokaxhiu/FFNx/compare/1.16.0...master
 
+## Common
+
+- Movie: Fix audio stream playing at the same time as the external audio
+
 ## FF7
 
 - Ambient: Allow ambient effects to playback in fields that use movies as background

diff --git a/src/video/movies.cpp b/src/video/movies.cpp
@@ -149,8 +149,13 @@ uint32_t ffmpeg_prepare_movie(char *name, bool with_audio)
 		goto exit;
 	}
 
-	audiostream = av_find_best_stream(format_ctx, AVMEDIA_TYPE_AUDIO, -1, -1, &acodec, 0);
-	if(with_audio && audiostream < 0 && (trace_movies || trace_all)) ffnx_trace("prepare_movie: no audio stream found\n");
+	if (with_audio)
+	{
+		audiostream = av_find_best_stream(format_ctx, AVMEDIA_TYPE_AUDIO, -1, -1, &acodec, 0);
+		if(audiostream < 0 && (trace_movies || trace_all)) ffnx_trace("prepare_movie: no audio stream found\n");
+	}
+	else
+		audiostream = -1;
 
 	codec_ctx = avcodec_alloc_context3(codec);
 	if (!codec_ctx) {