From e7a956e18a973aee1fb61cbda7a35bdf5d04803e Mon Sep 17 00:00:00 2001 From: zeromus Date: Mon, 9 Jun 2014 01:47:14 +0000 Subject: [PATCH] accept : in addition to . in ffmpeg output parsing --- BizHawk.Emulation.DiscSystem/Decoding.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/BizHawk.Emulation.DiscSystem/Decoding.cs b/BizHawk.Emulation.DiscSystem/Decoding.cs index a6803335f4..bd085aae8f 100644 --- a/BizHawk.Emulation.DiscSystem/Decoding.cs +++ b/BizHawk.Emulation.DiscSystem/Decoding.cs @@ -22,7 +22,9 @@ namespace BizHawk.Emulation.DiscSystem return args.Select(s => s.Contains(" ") ? string.Format("\"{0}\"", s) : s).ToArray(); } - static readonly Regex rxHasAudio = new Regex(@"Stream \#(\d*\:\d*)\: Audio", RegexOptions.Compiled); + //note: accepts . or : in the stream stream/substream separator in the stream ID format, since that changed at some point in FFMPEG history + //if someone has a better idea how to make the determination of whether an audio stream is available, I'm all ears + static readonly Regex rxHasAudio = new Regex(@"Stream \#(\d*(\.|\:)\d*)\: Audio", RegexOptions.Compiled); public AudioQueryResult QueryAudio(string path) { var ret = new AudioQueryResult();