diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-07 15:54:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-07 16:17:27 +0200 |
| commit | 3790801f9cedfae81cb8f055bbb0b14131459658 (patch) | |
| tree | 4fb4e35103252ce0a7cecf1d01041db506078894 /libavcodec/mpegvideoencdsp.h | |
| parent | 020865f557ccf06a41ecc461fd13ce6678817d04 (diff) | |
| parent | 3c650efb81aaa3b395ba4606ee68a47ee4efb57b (diff) | |
| download | ffmpeg-3790801f9cedfae81cb8f055bbb0b14131459658.tar.gz | |
Merge commit '3c650efb81aaa3b395ba4606ee68a47ee4efb57b'
* commit '3c650efb81aaa3b395ba4606ee68a47ee4efb57b':
dsputil: Move draw_edges() to mpegvideoencdsp
Conflicts:
libavcodec/mpegvideo_enc.c
libavcodec/x86/Makefile
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_x86.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideoencdsp.h')
| -rw-r--r-- | libavcodec/mpegvideoencdsp.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/mpegvideoencdsp.h b/libavcodec/mpegvideoencdsp.h index 81e3fe67b0..e12f4c6a39 100644 --- a/libavcodec/mpegvideoencdsp.h +++ b/libavcodec/mpegvideoencdsp.h @@ -26,6 +26,9 @@ #define BASIS_SHIFT 16 #define RECON_SHIFT 6 +#define EDGE_TOP 1 +#define EDGE_BOTTOM 2 + typedef struct MpegvideoEncDSPContext { int (*try_8x8basis)(int16_t rem[64], int16_t weight[64], int16_t basis[64], int scale); @@ -36,6 +39,9 @@ typedef struct MpegvideoEncDSPContext { void (*shrink[4])(uint8_t *dst, int dst_wrap, const uint8_t *src, int src_wrap, int width, int height); + + void (*draw_edges)(uint8_t *buf, int wrap, int width, int height, + int w, int h, int sides); } MpegvideoEncDSPContext; void ff_mpegvideoencdsp_init(MpegvideoEncDSPContext *c, |