diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 13:21:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 13:21:18 +0200 |
| commit | 3fee9fa0223263d0bcc1eb108a9499180705d3be (patch) | |
| tree | e720e52bf172723070479878eeb30a89686597d4 /libavcodec | |
| parent | ab4ba6b74d9ef287991e68b5b21d9539ea10a628 (diff) | |
| parent | 28bc406c84b04a5f1458b90ff52ddbec73e46202 (diff) | |
Merge commit '28bc406c84b04a5f1458b90ff52ddbec73e46202'
* commit '28bc406c84b04a5f1458b90ff52ddbec73e46202':
mjpeg: Use hpeldsp instead of dsputil for half-pel functions
svq1enc: Use hpeldsp instead of dsputil for half-pel functions
Conflicts:
configure
libavcodec/mjpegdec.c
libavcodec/svq1enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/svq1enc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/svq1enc.c b/libavcodec/svq1enc.c index cf9157f456..afef854f4c 100644 --- a/libavcodec/svq1enc.c +++ b/libavcodec/svq1enc.c @@ -447,9 +447,9 @@ static int svq1_encode_plane(SVQ1Context *s, int plane, dxy = (mx & 1) + 2 * (my & 1); s->hdsp.put_pixels_tab[0][dxy](temp + 16, - ref + (mx >> 1) + - stride * (my >> 1), - stride, 16); + ref + (mx >> 1) + + stride * (my >> 1), + stride, 16); score[1] += encode_block(s, src + 16 * x, temp + 16, decoded, stride, 5, 64, lambda, 0); |