diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-11 20:17:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-11 20:39:20 +0200 |
| commit | d912e449b655797407a75527380c566955b71a8e (patch) | |
| tree | 392b432edecba4d8a714da69dc123900d43b5be9 /libavcodec/ac3enc.h | |
| parent | 961a1a81d88a05afabb895f8a9dd11e789a07d89 (diff) | |
| parent | c766eb1ce1edb3ad03472b78c21e42c543b04937 (diff) | |
| download | ffmpeg-d912e449b655797407a75527380c566955b71a8e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ac3enc: add macros for option names to make them more understandable.
ac3enc: fix 'channel_coupling' option to actually allow 'auto'.
cavs: fix some crashes with invalid bitstreams
ac3enc: clip coupling coordinates during calculation
Remove incorrect info in documentation of AVCodecContext.bits_per_raw_sample.
lavc: fix parentheses placement in avcodec_open2().
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ac3enc.h')
| -rw-r--r-- | libavcodec/ac3enc.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/libavcodec/ac3enc.h b/libavcodec/ac3enc.h index a9210d7706..5c05f2c915 100644 --- a/libavcodec/ac3enc.h +++ b/libavcodec/ac3enc.h @@ -65,6 +65,23 @@ typedef int32_t CoefType; typedef int64_t CoefSumType; #endif +/* common option values */ +#define AC3ENC_OPT_NONE -1 +#define AC3ENC_OPT_AUTO -1 +#define AC3ENC_OPT_OFF 0 +#define AC3ENC_OPT_ON 1 +#define AC3ENC_OPT_NOT_INDICATED 0 +#define AC3ENC_OPT_MODE_ON 1 +#define AC3ENC_OPT_MODE_OFF 2 + +/* specific option values */ +#define AC3ENC_OPT_LARGE_ROOM 1 +#define AC3ENC_OPT_SMALL_ROOM 2 +#define AC3ENC_OPT_DOWNMIX_LTRT 1 +#define AC3ENC_OPT_DOWNMIX_LORO 2 +#define AC3ENC_OPT_ADCONV_STANDARD 0 +#define AC3ENC_OPT_ADCONV_HDCD 1 + #if 0 /** |