Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- From 4d42a1a1622af93f7acfcaf48b656b7a88445bc8 Mon Sep 17 00:00:00 2001
- From: James Almer <jamrial@gmail.com>
- Date: Sat, 5 Sep 2015 13:18:46 -0300
- Subject: [PATCH] avcodec/ac3: sync AC3HeaderInfo struct with the fork
- Signed-off-by: James Almer <jamrial@gmail.com>
- ---
- 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 {
- --
- 2.5.0
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement