diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2013-02-10 15:59:21 -0800 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-11 01:03:33 +0100 |
| commit | c7e3e55429cba3a9e125be382a9ad3d9f3c1a423 (patch) | |
| tree | 30e1b1afea7f3da972efa19387d93a12c2cb3bde | |
| parent | 55e35c98d5f3159e5902616bdce01add685510b5 (diff) | |
| download | ffmpeg-c7e3e55429cba3a9e125be382a9ad3d9f3c1a423.tar.gz | |
Move ff_emulated_edge_mc prototypes to videodsp.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/diracdec.c | 1 | ||||
| -rw-r--r-- | libavcodec/dsputil.h | 8 | ||||
| -rw-r--r-- | libavcodec/videodsp.h | 8 | ||||
| -rw-r--r-- | libavcodec/x86/dsputil_mmx.c | 1 |
4 files changed, 10 insertions, 8 deletions
diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c index a9191cd9cd..a791e8835a 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 b772b7e56b..f7aa3d8d81 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 dc893847b3..e397720773 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 7155363fec..98a6d5793d 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" |