Merge commit '13345fc1f86fc3615789e196d5a339c1c27c9068'

* commit '13345fc1f86fc3615789e196d5a339c1c27c9068':
  (e)ac3: parse and store the Dolby Surround, Surround EX and Headphone mode flags.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/ac3.h
Simple merge

diff --cc libavcodec/ac3_parser.c
Simple merge

diff --cc libavcodec/ac3dec.c
Simple merge

diff --cc libavcodec/ac3dec.h
index fa447c4,73ca1c3..fe9d9bc
--- 1/libavcodec/ac3dec.h
--- 2/libavcodec/ac3dec.h
+++ b/libavcodec/ac3dec.h
@@@ -86,14 -87,11 +87,17 @@@ typedef struct AC3DecodeContext 
      int center_mix_level;                   ///< Center mix level index
      int surround_mix_level;                 ///< Surround mix level index
      int eac3;                               ///< indicates if current frame is E-AC-3
+     int dolby_surround_mode;                ///< dolby surround mode                    (dsurmod)
+     int dolby_surround_ex_mode;             ///< dolby surround ex mode                 (dsurexmod)
+     int dolby_headphone_mode;               ///< dolby headphone mode                   (dheadphonmod)
  ///@}
  
 +    int preferred_stereo_downmix;
 +    float ltrt_center_mix_level;
 +    float ltrt_surround_mix_level;
 +    float loro_center_mix_level;
 +    float loro_surround_mix_level;
 +
  ///@name Frame syntax parameters
      int snr_offset_strategy;                ///< SNR offset strategy                    (snroffststr)
      int block_switch_syntax;                ///< block switch syntax enabled            (blkswe)

diff --cc libavcodec/eac3dec.c
Simple merge