1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00

avcodec/ac3: sync AC3HeaderInfo struct with the fork

Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2015-09-05 13:18:46 -03:00
parent 137f075993
commit 4a447e3e69

View File

@ -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 {