avcodec/ac3: sync AC3HeaderInfo struct with the fork

James Almer committed 11 years ago

Commit 4a447e31 parent 137f0751 file · +0 −5Browse files

Unified · Split

     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
     uint16_t frame_size;
     uint64_t channel_layout;
     /** @} */
-#if !AV_HAVE_INCOMPATIBLE_LIBAV_ABI
-    int dolby_surround_mode;
-#endif
 } AC3HeaderInfo;
 typedef enum {

Keyboard shortcuts