[FFmpeg-devel] [PATCH 2/3] Move ff_emulated_edge_mc prototypes to videodsp.

[Ronald S. Bultje]

From: "Ronald S. Bultje" <rsbultje at gmail.com>

---
 libavcodec/diracdec.c        | 1 +
 libavcodec/dsputil.h         | 8 --------
 libavcodec/videodsp.h        | 8 ++++++++
 libavcodec/x86/dsputil_mmx.c | 1 +
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c
index a9191cd..a791e88 100644
--- a/libavcodec/diracdec.c
+++ b/libavcodec/diracdec.c
@@ -37,6 +37,7 @@
 #include "dirac_dwt.h"
 #include "dirac.h"
 #include "diracdsp.h"
+#include "videodsp.h" // for ff_emulated_edge_mc_8
 
 /**
  * The spec limits the number of wavelet decompositions to 4 for both
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h
index b772b7e..f7aa3d8 100644
--- a/libavcodec/dsputil.h
+++ b/libavcodec/dsputil.h
@@ -139,14 +139,6 @@ void ff_init_scantable(uint8_t *, ScanTable *st, const uint8_t *src_scantable);
 void ff_init_scantable_permutation(uint8_t *idct_permutation,
                                    int idct_permutation_type);
 
-#define EMULATED_EDGE(depth) \
-void ff_emulated_edge_mc_ ## depth (uint8_t *buf, const uint8_t *src, ptrdiff_t linesize,\
-                         int block_w, int block_h,\
-                         int src_x, int src_y, int w, int h);
-
-EMULATED_EDGE(8)
-EMULATED_EDGE(16)
-
 /**
  * DSPContext.
  */
diff --git a/libavcodec/videodsp.h b/libavcodec/videodsp.h
index dc89384..e397720 100644
--- a/libavcodec/videodsp.h
+++ b/libavcodec/videodsp.h
@@ -29,6 +29,14 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#define EMULATED_EDGE(depth) \
+void ff_emulated_edge_mc_ ## depth (uint8_t *buf, const uint8_t *src, ptrdiff_t linesize,\
+                         int block_w, int block_h,\
+                         int src_x, int src_y, int w, int h);
+
+EMULATED_EDGE(8)
+EMULATED_EDGE(16)
+
 typedef struct VideoDSPContext {
     /**
      * Copy a rectangular area of samples to a temporary buffer and replicate
diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c
index 7155363..98a6d57 100644
--- a/libavcodec/x86/dsputil_mmx.c
+++ b/libavcodec/x86/dsputil_mmx.c
@@ -29,6 +29,7 @@
 #include "libavcodec/h264dsp.h"
 #include "libavcodec/mpegvideo.h"
 #include "libavcodec/simple_idct.h"
+#include "libavcodec/videodsp.h"
 #include "dsputil_mmx.h"
 #include "idct_xvid.h"
 #include "diracdsp_mmx.h"
-- 
1.7.11.3