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>

libavcodec/dca.h

@@ -213,4 +213,6 @@ int avpriv_dca_convert_bitstream(const uint8_t *src, int src_size, uint8_t *dst,
 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 */

libavcodec/dca_exss.c

@@ -22,7 +22,6 @@
 #include "libavutil/log.h"
 
 #include "dca.h"
-#include "dca_exss.h"
 #include "get_bits.h"
 
 /* extensions that reside in core substream */

libavcodec/dca_exss.h

@@ -1,28 +0,0 @@
-/*
- * DCA ExSS extension
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_DCA_EXSS_H
-#define AVCODEC_DCA_EXSS_H
-
-#include "dca.h"
-
-void ff_dca_exss_parse_header(DCAContext *s);
-
-#endif /* AVCODEC_DCA_EXSS_H */

libavcodec/dcadec.c

@@ -40,7 +40,6 @@
 #include "dcadata.h"
 #include "dcadsp.h"
 #include "dcahuff.h"
-#include "dca_exss.h"
 #include "fft.h"
 #include "fmtconvert.h"
 #include "get_bits.h"