[FFmpeg-cvslog] avcodec/ac3: move new field to the end of AC3HeaderInfo

Michael Niedermayer git at videolan.org
Sat Mar 1 02:13:25 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar  1 01:45:49 2014 +0100| [df6d21c1e7d347b533b78f0b0ff72bb52e104b73] | committer: Michael Niedermayer

avcodec/ac3: move new field to the end of AC3HeaderInfo

This structure is used in the interface between libs and thus cannot have
fields added in the middle without major bump

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=df6d21c1e7d347b533b78f0b0ff72bb52e104b73
---

 libavcodec/ac3.h |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libavcodec/ac3.h b/libavcodec/ac3.h
index de1508c..0cc9e2c 100644
--- a/libavcodec/ac3.h
+++ b/libavcodec/ac3.h
@@ -142,7 +142,9 @@ 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
@@ -155,6 +157,9 @@ 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