diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-15 13:56:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-15 15:07:10 +0100 |
| commit | 91e00c4a785d3f4cd44f1044d3e7b1b34fee8b5c (patch) | |
| tree | a866df7014974a63c167522f426dc53596d3c77b /libavcodec/snow.c | |
| parent | e28130bcaf48281b431ea611a546e7520bb90dda (diff) | |
| parent | 458446acfa1441d283dacf9e6e545beb083b8bb0 (diff) | |
| download | ffmpeg-91e00c4a785d3f4cd44f1044d3e7b1b34fee8b5c.tar.gz | |
Merge commit '458446acfa1441d283dacf9e6e545beb083b8bb0'
* commit '458446acfa1441d283dacf9e6e545beb083b8bb0':
lavc: Edge emulation with dst/src linesize
Conflicts:
libavcodec/cavs.c
libavcodec/h264.c
libavcodec/hevc.c
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_motion.c
libavcodec/rv34.c
libavcodec/svq3.c
libavcodec/vc1dec.c
libavcodec/videodsp.h
libavcodec/videodsp_template.c
libavcodec/vp3.c
libavcodec/vp8.c
libavcodec/wmv2.c
libavcodec/x86/videodsp.asm
libavcodec/x86/videodsp_init.c
Changes to the asm are not merged, they are left for volunteers or
in their absence for later.
The changes this merge introduces are reordering of the function
arguments
See: face578d56c2d1375e40d5e2a28acc122132bc55
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/snow.c')
| -rw-r--r-- | libavcodec/snow.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/snow.c b/libavcodec/snow.c index b54c491f42..c645b120fb 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -349,7 +349,8 @@ void ff_snow_pred_block(SnowContext *s, uint8_t *dst, uint8_t *tmp, ptrdiff_t st src += sx + sy*stride; if( (unsigned)sx >= FFMAX(w - b_w - (HTAPS_MAX-2), 0) || (unsigned)sy >= FFMAX(h - b_h - (HTAPS_MAX-2), 0)){ - s->vdsp.emulated_edge_mc(tmp + MB_SIZE, stride, src, stride, + s->vdsp.emulated_edge_mc(tmp + MB_SIZE, src, + stride, stride, b_w+HTAPS_MAX-1, b_h+HTAPS_MAX-1, sx, sy, w, h); src= tmp + MB_SIZE; |