avformat/mpegtsenc: Fix mpegts_write_pes() for private_stream_2 and other types

[ffmpeg] / libavcodec / aacps_fixed_tablegen.h

diff --git a/libavcodec/aacps_fixed_tablegen.h b/libavcodec/aacps_fixed_tablegen.h
index 8b82deb59672e6564949a71c27bcd28dd7bf4812..8fb1da5076ac0965ed232c64b18d0492d7c4c464 100644 (file)
--- a/libavcodec/aacps_fixed_tablegen.h
+++ b/libavcodec/aacps_fixed_tablegen.h
@@ -36,7 +36,12 @@
 #else
 #include "libavutil/common.h"
 #include "libavutil/mathematics.h"
-#include "libavutil/mem.h"
+#ifdef BUILD_TABLES
+#undef DECLARE_ALIGNED
+#define DECLARE_ALIGNED(align, type, variable) type variable
+#else
+#include "libavutil/mem_internal.h"
+#endif
 
 #include "aac_defines.h"
 #include "libavutil/softfloat.h"