diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-26 22:06:46 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-26 22:07:35 +0200 |
commit | 15fda8bcf1ea8e9676bb0e4cb4ccd81386a62c22 (patch) | |
tree | a60fb9e513f385594385db5e2b31bc7b2f301a2f /libavcodec/ac3enc.h | |
parent | b7caf89401232da02d2b493543b6dfcc524c15bf (diff) | |
parent | 4c2fd4b262347273afe97865ba451a1abde43ae6 (diff) |
Merge commit '4c2fd4b262347273afe97865ba451a1abde43ae6'
* commit '4c2fd4b262347273afe97865ba451a1abde43ae6':
ac3enc: allow Dolby Pro Logic II as a preferred downmix mode.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ac3enc.h')
-rw-r--r-- | libavcodec/ac3enc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/ac3enc.h b/libavcodec/ac3enc.h index 9c9a7ce509..070f5943ac 100644 --- a/libavcodec/ac3enc.h +++ b/libavcodec/ac3enc.h @@ -86,6 +86,7 @@ typedef int64_t CoefSumType; #define AC3ENC_OPT_SMALL_ROOM 2 #define AC3ENC_OPT_DOWNMIX_LTRT 1 #define AC3ENC_OPT_DOWNMIX_LORO 2 +#define AC3ENC_OPT_DOWNMIX_DPLII 3 // reserved value in A/52, but used by encoders to indicate DPL2 #define AC3ENC_OPT_ADCONV_STANDARD 0 #define AC3ENC_OPT_ADCONV_HDCD 1 |