2 files changed, 9 insertions, 1 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/Functions/Converters.cs b/win/CS/HandBrake.ApplicationServices/Functions/Converters.cs
index 830c074e9..1ad7a819f 100644
--- a/win/CS/HandBrake.ApplicationServices/Functions/Converters.cs
+++ b/win/CS/HandBrake.ApplicationServices/Functions/Converters.cs
@@ -157,6 +157,8 @@ namespace HandBrake.ApplicationServices.Functions
                     return "AAC (ffmpeg)";
                 case "ffflac":
                     return "Flac (ffmpeg)";
+                case "copy:*":
+                    return "Auto Passthru";
                 default:
                     return "AAC (faac)";
             }
@@ -193,6 +195,8 @@ namespace HandBrake.ApplicationServices.Functions
                     return AudioEncoder.Mp3Passthru;
                 case "copy:aac":
                     return AudioEncoder.AacPassthru;
+                case "copy:*":
+                    return AudioEncoder.Passthrough;
                 default:
                     return AudioEncoder.Faac;
             }
@@ -231,6 +235,8 @@ namespace HandBrake.ApplicationServices.Functions
                     return AudioEncoder.Mp3Passthru;
                 case "Flac (ffmpeg)":
                     return AudioEncoder.ffflac;
+                case "Auto Passthru":
+                    return AudioEncoder.Passthrough;
                 default:
                     return AudioEncoder.Faac;
             }
@@ -269,6 +275,8 @@ namespace HandBrake.ApplicationServices.Functions
                     return "copy:aac";
                 case AudioEncoder.Mp3Passthru:
                     return "copy:mp3";
+                case AudioEncoder.Passthrough:
+                    return "copy:*";
                 case AudioEncoder.ffflac:
                     return "ffflac";
                 default:
diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
index e709add79..527ba35f4 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
@@ -95,7 +95,7 @@ namespace HandBrake.ApplicationServices.Utilities
             Match noAudio = Regex.Match(input, @"-a none");
             Match audioTracks = Regex.Match(input, @"-a ([0-9,]*)");
             Match audioTrackMixes = Regex.Match(input, @"-6 ([0-9a-zA-Z,]*)");
-            Match audioEncoders = Regex.Match(input, @"-E ([a-zA-Z0-9+,:]*)");
+            Match audioEncoders = Regex.Match(input, @"-E ([a-zA-Z0-9+,:\*]*)");
             Match audioBitrates = Regex.Match(input, @"-B ([0-9a-zA-Z,]*)"); // Auto = a-z
             Match audioSampleRates = Regex.Match(input, @"-R ([0-9a-zA-Z.,]*)"); // Auto = a-z
             Match drcValues = Regex.Match(input, @"-D ([0-9.,]*)");