diff --git a/libavcodec/dca.h b/libavcodec/dca.h index b752bc3fdb..6078b2e846 100644 --- a/libavcodec/dca.h +++ b/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 */ diff --git a/libavcodec/dca_exss.c b/libavcodec/dca_exss.c index ffccec84c6..c379eaf86f 100644 --- a/libavcodec/dca_exss.c +++ b/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 */ diff --git a/libavcodec/dca_exss.h b/libavcodec/dca_exss.h deleted file mode 100644 index 6689bbb3fb..0000000000 --- a/libavcodec/dca_exss.h +++ /dev/null @@ -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 */ diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c index 138304532a..bb1504978f 100644 --- a/libavcodec/dcadec.c +++ b/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"