mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-08 13:22:53 +02:00
aacdec: move aacdec.h into libavcodec/aac
This commit is contained in:
parent
cd1e404a10
commit
551ce16b59
@ -34,7 +34,7 @@
|
||||
|
||||
#include "libavcodec/aac.h"
|
||||
#include "libavcodec/aacsbr.h"
|
||||
#include "libavcodec/aacdec.h"
|
||||
#include "aacdec.h"
|
||||
#include "libavcodec/avcodec.h"
|
||||
#include "libavutil/attributes.h"
|
||||
#include "libavutil/error.h"
|
||||
|
@ -27,8 +27,8 @@
|
||||
* @author Maxim Gavrilov ( maxim.gavrilov gmail com )
|
||||
*/
|
||||
|
||||
#ifndef AVCODEC_AACDEC_H
|
||||
#define AVCODEC_AACDEC_H
|
||||
#ifndef AVCODEC_AAC_AACDEC_H
|
||||
#define AVCODEC_AAC_AACDEC_H
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
@ -38,8 +38,8 @@
|
||||
#include "libavutil/mem_internal.h"
|
||||
#include "libavutil/tx.h"
|
||||
|
||||
#include "aac.h"
|
||||
#include "mpeg4audio.h"
|
||||
#include "libavcodec/aac.h"
|
||||
#include "libavcodec/mpeg4audio.h"
|
||||
|
||||
typedef struct AACDecContext AACDecContext;
|
||||
|
||||
@ -349,4 +349,4 @@ void ff_aacdec_init_mips(AACDecContext *c);
|
||||
int ff_aac_decode_ics(AACDecContext *ac, SingleChannelElement *sce,
|
||||
GetBitContext *gb, int common_window, int scale_flag);
|
||||
|
||||
#endif /* AVCODEC_AACDEC_H */
|
||||
#endif /* AVCODEC_AAC_AACDEC_H */
|
@ -29,7 +29,7 @@
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#include "libavcodec/aacdec.h"
|
||||
#include "aacdec.h"
|
||||
#include "libavcodec/lpc_functions.h"
|
||||
|
||||
#include "libavcodec/aactab.h"
|
||||
|
@ -36,7 +36,7 @@
|
||||
#include "libavcodec/aac_defines.h"
|
||||
|
||||
#include "libavcodec/avcodec.h"
|
||||
#include "libavcodec/aacdec.h"
|
||||
#include "aacdec.h"
|
||||
#include "libavcodec/aactab.h"
|
||||
#include "libavcodec/sinewin_fixed_tablegen.h"
|
||||
#include "libavcodec/kbdwin.h"
|
||||
|
@ -32,7 +32,7 @@
|
||||
#ifndef AVCODEC_AAC_AACDEC_FIXED_COUPLING_H
|
||||
#define AVCODEC_AAC_AACDEC_FIXED_COUPLING_H
|
||||
|
||||
#include "libavcodec/aacdec.h"
|
||||
#include "aacdec.h"
|
||||
|
||||
/**
|
||||
* Apply dependent channel coupling (applied before IMDCT).
|
||||
|
@ -36,7 +36,7 @@
|
||||
#include "libavcodec/aac_defines.h"
|
||||
|
||||
#include "libavcodec/avcodec.h"
|
||||
#include "libavcodec/aacdec.h"
|
||||
#include "aacdec.h"
|
||||
#include "libavcodec/aactab.h"
|
||||
#include "libavcodec/sinewin.h"
|
||||
#include "libavcodec/kbdwin.h"
|
||||
|
@ -32,7 +32,7 @@
|
||||
#ifndef AVCODEC_AAC_AACDEC_FLOAT_COUPLING_H
|
||||
#define AVCODEC_AAC_AACDEC_FLOAT_COUPLING_H
|
||||
|
||||
#include "libavcodec/aacdec.h"
|
||||
#include "aacdec.h"
|
||||
|
||||
/**
|
||||
* Apply dependent channel coupling (applied before IMDCT).
|
||||
|
@ -42,7 +42,7 @@
|
||||
#include "sinewin.h"
|
||||
|
||||
#include "aac.h"
|
||||
#include "aacdec.h"
|
||||
#include "aac/aacdec.h"
|
||||
#include "aactab.h"
|
||||
#include "aac/aacdec_tab.h"
|
||||
#include "adts_header.h"
|
||||
|
@ -30,7 +30,7 @@
|
||||
#define AVCODEC_AACSBR_H
|
||||
|
||||
#include "get_bits.h"
|
||||
#include "aacdec.h"
|
||||
#include "aac/aacdec.h"
|
||||
#include "aac_defines.h"
|
||||
|
||||
#include "libavutil/attributes_internal.h"
|
||||
|
@ -32,7 +32,7 @@
|
||||
* @author Zoran Basaric ( zoran.basaric@imgtec.com )
|
||||
*/
|
||||
|
||||
#include "aacdec.h"
|
||||
#include "aac/aacdec.h"
|
||||
#include "aac/aacdec_tab.h"
|
||||
#include "avcodec.h"
|
||||
#include "libavutil/qsort.h"
|
||||
|
Loading…
Reference in New Issue
Block a user