[FFmpeg-cvslog] avcodec/ac3: sync AC3HeaderInfo struct with the fork
James Almer
git at videolan.org
Sat Sep 5 18:26:07 CEST 2015
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Sep 5 13:18:46 2015 -0300| [4a447e3e692ee52ec2b226973843dbd3ce9bb02b] | committer: James Almer
avcodec/ac3: sync AC3HeaderInfo struct with the fork
Reviewed-by: Hendrik Leppkes <h.leppkes at gmail.com>
Signed-off-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4a447e3e692ee52ec2b226973843dbd3ce9bb02b
---
libavcodec/ac3.h | 5 -----
1 file changed, 5 deletions(-)
diff --git a/libavcodec/ac3.h b/libavcodec/ac3.h
index 1fe30b9..3f67e09 100644
--- 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 {
More information about the ffmpeg-cvslog
mailing list