diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-09 17:12:19 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-09 17:19:24 +0400 |
commit | 2830f287e2f271bcf773f645e5d9cb9aa5204f7f (patch) | |
tree | ceda9d20e4c2e19e32e1c092e36dc8558fb0f0e2 /libavcodec/svq3.c | |
parent | bba73f5574afd3095e017f70bca1547dd43f702f (diff) | |
parent | ebfe622bb1ca57cecb932e42926745cba7161913 (diff) |
Merge commit 'ebfe622bb1ca57cecb932e42926745cba7161913'
* commit 'ebfe622bb1ca57cecb932e42926745cba7161913':
mpegvideo: drop support for real (non-emulated) edges
Conflicts:
libavcodec/mpegvideo.c
libavcodec/mpegvideo_motion.c
libavcodec/wmv2.c
If this is slower on a major platform then it should be investigated
and potentially reverted.
See: 8fc52a5ef94712d900fc8fe7503cf9c9ba635143
See: 3969b4b861ce8152e3195e8f8c3437abd273b90a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/svq3.c')
-rw-r--r-- | libavcodec/svq3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index e1d25885c6..75dc3d5b9a 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -1299,7 +1299,7 @@ static int svq3_decode_frame(AVCodecContext *avctx, void *data, } ff_draw_horiz_band(avctx, NULL, s->cur_pic, s->last_pic->f.data[0] ? s->last_pic : NULL, - 16 * h->mb_y, 16, h->picture_structure, 0, 0, + 16 * h->mb_y, 16, h->picture_structure, 0, h->low_delay, h->mb_height * 16, h->mb_width * 16); } |