diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-16 01:56:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-16 01:56:31 +0100 |
| commit | fdf8b59b28cbe458ca6933bbb9394936a5fcbf91 (patch) | |
| tree | b5c021d35cc4a53b9b15fa0083e578ff478be83f | |
| parent | e5c7229999182ad1cef13b9eca050dba7a5a08da (diff) | |
| parent | 9c0e4b3395cad79c560d03d2a94595d89e017885 (diff) | |
| download | ffmpeg-fdf8b59b28cbe458ca6933bbb9394936a5fcbf91.tar.gz | |
Merge commit '9c0e4b3395cad79c560d03d2a94595d89e017885'
* commit '9c0e4b3395cad79c560d03d2a94595d89e017885':
ac3: update AC3PreferredStereoDownmixMode.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/ac3.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/ac3.h b/libavcodec/ac3.h index ed426864b8..de1508ce21 100644 --- a/libavcodec/ac3.h +++ b/libavcodec/ac3.h @@ -111,7 +111,7 @@ typedef enum AC3PreferredStereoDownmixMode { AC3_DMIXMOD_NOTINDICATED = 0, AC3_DMIXMOD_LTRT, AC3_DMIXMOD_LORO, - AC3_DMIXMOD_RESERVED + AC3_DMIXMOD_DPLII // reserved value in A/52, but used by encoders to indicate DPL2 } AC3PreferredStereoDownmixMode; typedef struct AC3BitAllocParameters { |