summaryrefslogtreecommitdiff
path: root/libavcodec/aac_tablegen_decl.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-05-22 04:53:19 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-05-22 04:53:19 +0200
commitbf8bb94322d92134206392c3f238a58c424b1c9e (patch)
tree5522036771e42e1e7b539fb190302b530bcb49d0 /libavcodec/aac_tablegen_decl.h
parent33adcdb53118df8f281742b75adf861cda64801a (diff)
parent71cc331cab8d61130048f3003f2ca77cfb94e3f3 (diff)
downloadffmpeg-bf8bb94322d92134206392c3f238a58c424b1c9e.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: ffmpeg: get rid of the -vglobal option. dct32: Add AVX implementation of 32-point DCT dct32: Change pass 6 permutation to allow for AVX implementation dct32: port SSE 32-point DCT to YASM multiple inclusion guard cleanup avio: document buffer must created with av_malloc() and friends avio: check AVIOContext malloc failure swscale: point out an alternative to sws_getContext svq3: Do initialization after parsing the extradata add changelog entries for 0.7_beta2 mp3lame: add #include required for AV_RB32 macro. Conflicts: Changelog libavcodec/svq3.c libavcodec/x86/dct32_sse.c libavfilter/vsrc_buffer.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aac_tablegen_decl.h')
-rw-r--r--libavcodec/aac_tablegen_decl.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/aac_tablegen_decl.h b/libavcodec/aac_tablegen_decl.h
index 9a90a09b07..0d86e80bc2 100644
--- a/libavcodec/aac_tablegen_decl.h
+++ b/libavcodec/aac_tablegen_decl.h
@@ -20,8 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef AAC_TABLEGEN_DECL_H
-#define AAC_TABLEGEN_DECL_H
+#ifndef AVCODEC_AAC_TABLEGEN_DECL_H
+#define AVCODEC_AAC_TABLEGEN_DECL_H
#if CONFIG_HARDCODED_TABLES
#define ff_aac_tableinit()
@@ -31,4 +31,4 @@ void ff_aac_tableinit(void);
extern float ff_aac_pow2sf_tab[428];
#endif /* CONFIG_HARDCODED_TABLES */
-#endif /* AAC_TABLEGEN_DECL_H */
+#endif /* AVCODEC_AAC_TABLEGEN_DECL_H */