Merge commit 'f8c1719771dc4ac2e13e6bc8bf741854a30e3a86'

* commit 'f8c1719771dc4ac2e13e6bc8bf741854a30e3a86':
  dca: Remove separate header for DCA ExSS

Conflicts:
	libavcodec/dca.h
	libavcodec/dca_exss.h

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

diff --cc libavcodec/dca.h
index b752bc3,e3ec5ca..6078b2e
--- 1/libavcodec/dca.h
--- 2/libavcodec/dca.h
+++ b/libavcodec/dca.h
@@@ -207,10 -191,9 +207,12 @@@ extern av_export const uint32_t avpriv_
  /**
   * Convert bitstream to one representation based on sync marker
   */
 -int ff_dca_convert_bitstream(const uint8_t *src, int src_size, uint8_t *dst,
 +int avpriv_dca_convert_bitstream(const uint8_t *src, int src_size, uint8_t *dst,
                               int max_size);
  
 +int ff_dca_xbr_parse_frame(DCAContext *s);
 +int ff_dca_xxch_decode_frame(DCAContext *s);
 +
+ void ff_dca_exss_parse_header(DCAContext *s);
+ 
  #endif /* AVCODEC_DCA_H */

diff --cc libavcodec/dca_exss.c
Simple merge

diff --cc libavcodec/dcadec.c
Simple merge