aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2014-01-09 10:27:20 +0100
committerDiego Biurrun <diego@biurrun.de>2014-03-26 04:31:27 -0700
commitaba70bb5387f12dfa5e6cd8cb861c9c7e668151f (patch)
tree0da2638dc7ea343430826b9952cc5fbb71d305b5
parente7373585f827d4ec05d952daa3877e8decfe3c08 (diff)
downloadffmpeg-aba70bb5387f12dfa5e6cd8cb861c9c7e668151f.tar.gz
Add missing headers to make template files compile (more) standalone
-rw-r--r--libavcodec/ac3enc_template.c4
-rw-r--r--libavcodec/h264_mb_template.c2
-rw-r--r--libavcodec/h264_mc_template.c2
-rw-r--r--libavcodec/h264idct_template.c1
-rw-r--r--libavcodec/hpel_template.c2
-rw-r--r--libavcodec/motion_est_template.c2
-rw-r--r--libavcodec/simple_idct_template.c2
-rw-r--r--libavcodec/videodsp_template.c2
-rw-r--r--libavcodec/x86/dsputil_qns_template.c6
-rw-r--r--libavcodec/x86/hpeldsp_rnd_template.c3
-rw-r--r--libavcodec/x86/mpegvideoenc_template.c6
-rw-r--r--libavresample/resample_template.c6
-rw-r--r--libswscale/x86/rgb2rgb_template.c2
-rw-r--r--libswscale/x86/swscale_template.c5
-rw-r--r--libswscale/x86/yuv2rgb_template.c5
15 files changed, 50 insertions, 0 deletions
diff --git a/libavcodec/ac3enc_template.c b/libavcodec/ac3enc_template.c
index 1b887268ed..ad296e1590 100644
--- a/libavcodec/ac3enc_template.c
+++ b/libavcodec/ac3enc_template.c
@@ -28,7 +28,11 @@
#include <stdint.h>
+#include "libavutil/attributes.h"
#include "libavutil/internal.h"
+#include "internal.h"
+#include "ac3enc.h"
+#include "eac3enc.h"
/* prototypes for static functions in ac3enc_fixed.c and ac3enc_float.c */
diff --git a/libavcodec/h264_mb_template.c b/libavcodec/h264_mb_template.c
index 0eb1d762eb..5b2917f51c 100644
--- a/libavcodec/h264_mb_template.c
+++ b/libavcodec/h264_mb_template.c
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "svq3.h"
+
#undef FUNC
#undef PIXEL_SHIFT
diff --git a/libavcodec/h264_mc_template.c b/libavcodec/h264_mc_template.c
index dee02f5908..c085cc35d7 100644
--- a/libavcodec/h264_mc_template.c
+++ b/libavcodec/h264_mc_template.c
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "h264.h"
+
#undef MCFUNC
#if CHROMA_IDC == 1
diff --git a/libavcodec/h264idct_template.c b/libavcodec/h264idct_template.c
index aadafaddd2..83c2a959b2 100644
--- a/libavcodec/h264idct_template.c
+++ b/libavcodec/h264idct_template.c
@@ -28,6 +28,7 @@
#include "bit_depth_template.c"
#include "libavutil/common.h"
#include "h264.h"
+#include "h264idct.h"
void FUNCC(ff_h264_idct_add)(uint8_t *_dst, int16_t *_block, int stride)
{
diff --git a/libavcodec/hpel_template.c b/libavcodec/hpel_template.c
index fa7a614b82..81d3892e56 100644
--- a/libavcodec/hpel_template.c
+++ b/libavcodec/hpel_template.c
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavutil/intreadwrite.h"
+
#include "pixels.h"
#include "bit_depth_template.c"
diff --git a/libavcodec/motion_est_template.c b/libavcodec/motion_est_template.c
index 7228744756..3848ad4b27 100644
--- a/libavcodec/motion_est_template.c
+++ b/libavcodec/motion_est_template.c
@@ -24,6 +24,8 @@
* Motion estimation template.
*/
+#include "mpegvideo.h"
+
//Let us hope gcc will remove the unused vars ...(gcc 3.2.2 seems to do it ...)
#define LOAD_COMMON\
uint32_t av_unused * const score_map= c->score_map;\
diff --git a/libavcodec/simple_idct_template.c b/libavcodec/simple_idct_template.c
index 367bc34012..b287c4f6bf 100644
--- a/libavcodec/simple_idct_template.c
+++ b/libavcodec/simple_idct_template.c
@@ -30,6 +30,8 @@
written by Aaron Holtzman <aholtzma@ess.engr.uvic.ca>)
*/
+#include "simple_idct.h"
+
#include "bit_depth_template.c"
#undef W1
diff --git a/libavcodec/videodsp_template.c b/libavcodec/videodsp_template.c
index 98313ac5cd..28b8c3286d 100644
--- a/libavcodec/videodsp_template.c
+++ b/libavcodec/videodsp_template.c
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <assert.h>
+
#include "bit_depth_template.c"
static void FUNC(ff_emulated_edge_mc)(uint8_t *buf, const uint8_t *src,
diff --git a/libavcodec/x86/dsputil_qns_template.c b/libavcodec/x86/dsputil_qns_template.c
index 14ab425718..321d14ae44 100644
--- a/libavcodec/x86/dsputil_qns_template.c
+++ b/libavcodec/x86/dsputil_qns_template.c
@@ -22,6 +22,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <assert.h>
+#include <stdint.h>
+
+#include "libavutil/common.h"
+#include "libavutil/x86/asm.h"
+
#include "inline_asm.h"
#define MAX_ABS (512 >> (SCALE_OFFSET>0 ? SCALE_OFFSET : 0))
diff --git a/libavcodec/x86/hpeldsp_rnd_template.c b/libavcodec/x86/hpeldsp_rnd_template.c
index b514a8fd4e..d854e8a2fc 100644
--- a/libavcodec/x86/hpeldsp_rnd_template.c
+++ b/libavcodec/x86/hpeldsp_rnd_template.c
@@ -24,6 +24,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <stddef.h>
+#include <stdint.h>
+
// put_pixels
static void DEF(put, pixels8_x2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
{
diff --git a/libavcodec/x86/mpegvideoenc_template.c b/libavcodec/x86/mpegvideoenc_template.c
index ed00e8eea7..d01ff1c0f8 100644
--- a/libavcodec/x86/mpegvideoenc_template.c
+++ b/libavcodec/x86/mpegvideoenc_template.c
@@ -20,6 +20,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <stdint.h>
+
+#include "libavutil/internal.h"
+#include "libavutil/x86/asm.h"
+#include "libavcodec/mpegvideo.h"
+
#undef MMREG_WIDTH
#undef MM
#undef MOVQ
diff --git a/libavresample/resample_template.c b/libavresample/resample_template.c
index 5b0fbecdf5..cd69eb8b44 100644
--- a/libavresample/resample_template.c
+++ b/libavresample/resample_template.c
@@ -18,6 +18,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <math.h>
+#include <stdint.h>
+
+#include "libavutil/common.h"
+#include "internal.h"
+
#if defined(CONFIG_RESAMPLE_DBL)
#define SET_TYPE(func) func ## _dbl
#define FELEM double
diff --git a/libswscale/x86/rgb2rgb_template.c b/libswscale/x86/rgb2rgb_template.c
index dc3c694a9e..5d34c21711 100644
--- a/libswscale/x86/rgb2rgb_template.c
+++ b/libswscale/x86/rgb2rgb_template.c
@@ -25,8 +25,10 @@
*/
#include <stddef.h>
+#include <stdint.h>
#include "libavutil/attributes.h"
+#include "libavutil/x86/asm.h"
#undef PREFETCH
#undef MOVNTQ
diff --git a/libswscale/x86/swscale_template.c b/libswscale/x86/swscale_template.c
index 80a3ad9a3d..1e42ec5b12 100644
--- a/libswscale/x86/swscale_template.c
+++ b/libswscale/x86/swscale_template.c
@@ -18,6 +18,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <stdint.h>
+
+#include "libavutil/x86/asm.h"
+#include "libswscale/swscale_internal.h"
+
#undef REAL_MOVNTQ
#undef MOVNTQ
#undef PREFETCH
diff --git a/libswscale/x86/yuv2rgb_template.c b/libswscale/x86/yuv2rgb_template.c
index b028e93152..0b9751623e 100644
--- a/libswscale/x86/yuv2rgb_template.c
+++ b/libswscale/x86/yuv2rgb_template.c
@@ -21,6 +21,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <stdint.h>
+
+#include "libavutil/x86/asm.h"
+#include "libswscale/swscale_internal.h"
+
#undef MOVNTQ
#undef EMMS
#undef SFENCE