avcodec/ac3: sync AC3HeaderInfo struct with the fork

Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
10 years ago · 4a447e3e69
parent 137f075993
commit 4a447e3e69
1 changed files with 0 additions and 5 deletions
--- 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 {