Unified · Split
| @@ -190,9 +190,7 @@ typedef struct AC3HeaderInfo { · 189 unmodified lines | ||
| 190 | 190 | int surround_mix_level; ///< Surround mix level index |
| 191 | 191 | uint16_t channel_map; |
| 192 | 192 | int num_blocks; ///< number of audio blocks |
| 193 | −#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI | |
| 194 | 193 | int dolby_surround_mode; |
| 195 | −#endif | |
| 196 | 194 | /** @} */ |
| 197 | 195 | |
| 198 | 196 | /** @name Derived values |
| @@ -205,9 +203,6 @@ typedef struct AC3HeaderInfo { · 6 unmodified lines | ||
| 205 | 203 | uint16_t frame_size; |
| 206 | 204 | uint64_t channel_layout; |
| 207 | 205 | /** @} */ |
| 208 | −#if !AV_HAVE_INCOMPATIBLE_LIBAV_ABI | |
| 209 | − int dolby_surround_mode; | |
| 210 | −#endif | |
| 211 | 206 | } AC3HeaderInfo; |
| 212 | 207 | |
| 213 | 208 | typedef enum { |