From: dynaflash <dynaflash@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Date: Fri, 2 Apr 2010 15:50:35 +0000 (+0000)
Subject: MacGui: Remove the AC3 and DCA audio input codec limitations for selecting mono or... 
X-Git-Url: http://git.osdn.jp/view?a=commitdiff_plain;h=49d4a820f33a63fc9ae1948d26677a036ab261bf;p=handbrake-jp%2Fhandbrake-jp-git.git

MacGui: Remove the AC3 and DCA audio input codec limitations for selecting mono or more importantly 6 channel discrete as per svn rev 3182.

git-svn-id: svn://localhost/HandBrake/trunk@3184 b64f7644-9d1e-0410-96f1-a4d463321fa5
---

diff --git a/macosx/Controller.m b/macosx/Controller.m
index a806356c..42b7a247 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -5750,16 +5750,10 @@ the user is using "Custom" settings by determining the sender*/
         {
 
             /* find out if our selected output audio codec supports mono and / or 6ch */
-            /* we also check for an input codec of AC3 or DCA,
-             as they are the only libraries able to do the mixdown to mono / conversion to 6-ch */
             /* audioCodecsSupportMono and audioCodecsSupport6Ch are the same for now,
              but this may change in the future, so they are separated for flexibility */
-            int audioCodecsSupportMono =
-                    (audio->in.codec & (HB_ACODEC_AC3|HB_ACODEC_DCA)) &&
-                    (acodec != HB_ACODEC_LAME);
-            int audioCodecsSupport6Ch =
-                    (audio->in.codec & (HB_ACODEC_AC3|HB_ACODEC_DCA)) &&
-                    (acodec != HB_ACODEC_LAME);
+            int audioCodecsSupportMono = (audio->in.codec && acodec != HB_ACODEC_LAME);
+            int audioCodecsSupport6Ch = (audio->in.codec && acodec != HB_ACODEC_LAME);
             
             /* check for AC-3 passthru */
             if (audio->in.codec == HB_ACODEC_AC3 && acodec == HB_ACODEC_AC3)