avcodec/ac3: sync AC3HeaderInfo struct with the fork
authorJames Almer <jamrial@gmail.com>
Sat, 5 Sep 2015 16:18:46 +0000 (13:18 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 5 Sep 2015 16:24:52 +0000 (13:24 -0300)
Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
libavcodec/ac3.h

index 1fe30b9..3f67e09 100644 (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 {