diff options
| author | James Almer <jamrial@gmail.com> | 2015-09-05 13:18:46 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2015-09-05 13:24:52 -0300 |
| commit | 4a447e3e692ee52ec2b226973843dbd3ce9bb02b (patch) | |
| tree | 9baac6446cc00ed05682da28bd884f942e878f3d /libavcodec/ac3.h | |
| parent | 137f0759933390ecbde2bff0e009deabb4273c72 (diff) | |
avcodec/ac3: sync AC3HeaderInfo struct with the fork
Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/ac3.h')
| -rw-r--r-- | libavcodec/ac3.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libavcodec/ac3.h b/libavcodec/ac3.h index 1fe30b9587..3f67e09aea 100644 --- a/libavcodec/ac3.h +++ b/libavcodec/ac3.h @@ -190,9 +190,7 @@ typedef struct AC3HeaderInfo { int surround_mix_level; ///< Surround mix level index uint16_t channel_map; int num_blocks; ///< number of audio blocks -#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI int dolby_surround_mode; -#endif /** @} */ /** @name Derived values @@ -205,9 +203,6 @@ typedef struct AC3HeaderInfo { uint16_t frame_size; uint64_t channel_layout; /** @} */ -#if !AV_HAVE_INCOMPATIBLE_LIBAV_ABI - int dolby_surround_mode; -#endif } AC3HeaderInfo; typedef enum { |