Commit 4a447e3e authored by James Almer's avatar James Almer

avcodec/ac3: sync AC3HeaderInfo struct with the fork

Reviewed-by: 's avatarHendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: 's avatarJames Almer <jamrial@gmail.com>
parent 137f0759
...@@ -190,9 +190,7 @@ typedef struct AC3HeaderInfo { ...@@ -190,9 +190,7 @@ typedef struct AC3HeaderInfo {
int surround_mix_level; ///< Surround mix level index int surround_mix_level; ///< Surround mix level index
uint16_t channel_map; uint16_t channel_map;
int num_blocks; ///< number of audio blocks int num_blocks; ///< number of audio blocks
#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI
int dolby_surround_mode; int dolby_surround_mode;
#endif
/** @} */ /** @} */
/** @name Derived values /** @name Derived values
...@@ -205,9 +203,6 @@ typedef struct AC3HeaderInfo { ...@@ -205,9 +203,6 @@ typedef struct AC3HeaderInfo {
uint16_t frame_size; uint16_t frame_size;
uint64_t channel_layout; uint64_t channel_layout;
/** @} */ /** @} */
#if !AV_HAVE_INCOMPATIBLE_LIBAV_ABI
int dolby_surround_mode;
#endif
} AC3HeaderInfo; } AC3HeaderInfo;
typedef enum { typedef enum {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment