diff options
| author | van <[email protected]> | 2008-05-31 17:00:42 +0000 |
|---|---|---|
| committer | van <[email protected]> | 2008-05-31 17:00:42 +0000 |
| commit | afbd06d8d6151b69bbb18adf83cfab8d680c3946 (patch) | |
| tree | 4e7be731854c8b8db8f87934c301c60a9155387c /macosx/Controller.mm | |
| parent | d0550da569b56a71857c34463c5b030172d47291 (diff) | |
- support blu-ray, avchd & dvb x264
- support video files handled by ffmpeg (avi, mkv, mp4, etc.)
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1480 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx/Controller.mm')
| -rw-r--r-- | macosx/Controller.mm | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/macosx/Controller.mm b/macosx/Controller.mm index 5ee6bc1fb..b2178587a 100644 --- a/macosx/Controller.mm +++ b/macosx/Controller.mm @@ -3237,11 +3237,12 @@ the user is using "Custom" settings by determining the sender*/ 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 || - audio->in.codec == HB_ACODEC_DCA) && acodec == HB_ACODEC_FAAC); - int audioCodecsSupport6Ch = ((audio->in.codec == HB_ACODEC_AC3 || - audio->in.codec == HB_ACODEC_DCA) && (acodec == HB_ACODEC_FAAC || - acodec == HB_ACODEC_VORBIS)); + 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); /* check for AC-3 passthru */ if (audio->in.codec == HB_ACODEC_AC3 && acodec == HB_ACODEC_AC3) |