diff options
| author | sr55 <[email protected]> | 2013-03-09 22:32:07 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2013-03-09 22:32:07 +0000 |
| commit | e6bbf3b9ecfd237eec98bd2711800f267ee9ddb1 (patch) | |
| tree | ca11f6a3df993dd40d8c247d7c8ee5640ca2bc91 /libhb/common.h | |
| parent | e318631790e818539c917f567cc39babe5def745 (diff) | |
Merging Trunk to OpenCL branch
git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/opencl@5319 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/common.h')
| -rw-r--r-- | libhb/common.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libhb/common.h b/libhb/common.h index a50591a5f..2198aa0d7 100644 --- a/libhb/common.h +++ b/libhb/common.h @@ -1,6 +1,6 @@ /* common.h - Copyright (c) 2003-2012 HandBrake Team + Copyright (c) 2003-2013 HandBrake Team This file is part of the HandBrake source code Homepage: <http://handbrake.fr/>. It may be used under the terms of the GNU General Public License v2. @@ -483,7 +483,7 @@ struct hb_job_s /* Audio starts here */ /* Audio Codecs */ -#define HB_ACODEC_MASK 0x003FFF00 +#define HB_ACODEC_MASK 0x00FFFF00 #define HB_ACODEC_FAAC 0x00000100 #define HB_ACODEC_LAME 0x00000200 #define HB_ACODEC_VORBIS 0x00000400 @@ -498,7 +498,9 @@ struct hb_job_s #define HB_ACODEC_MP3 0x00080000 #define HB_ACODEC_FFFLAC 0x00100000 #define HB_ACODEC_FFFLAC24 0x00200000 -#define HB_ACODEC_FF_MASK 0x003F2000 +#define HB_ACODEC_FDK_AAC 0x00400000 +#define HB_ACODEC_FDK_HAAC 0x00800000 +#define HB_ACODEC_FF_MASK 0x00FF2000 #define HB_ACODEC_PASS_FLAG 0x40000000 #define HB_ACODEC_PASS_MASK (HB_ACODEC_MP3 | HB_ACODEC_FFAAC | HB_ACODEC_DCA_HD | HB_ACODEC_AC3 | HB_ACODEC_DCA) #define HB_ACODEC_AUTO_PASS (HB_ACODEC_PASS_MASK | HB_ACODEC_PASS_FLAG) |