diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-29 20:05:12 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-29 20:05:51 +0400 |
commit | fbafd64acce4a2a0aa6a5b392524a99f397e96a8 (patch) | |
tree | d75aec398f51fa4721cf5bcc9175a1e6e17676c5 /libavcodec/svq3.c | |
parent | cfe282ec80dc03667418c601283134eec25f17cf (diff) | |
parent | 54b2ce7418c0e1467c9e67274e55e1bd86189e63 (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpeg: Drop unused parameters from ff_draw_horiz_band()
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/svq3.c')
-rw-r--r-- | libavcodec/svq3.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index 75dc3d5b9a..f41fa599c3 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -1298,9 +1298,10 @@ static int svq3_decode_frame(AVCodecContext *avctx, void *data, (h->pict_type == AV_PICTURE_TYPE_P && mb_type < 8) ? (mb_type - 1) : -1; } - ff_draw_horiz_band(avctx, NULL, s->cur_pic, s->last_pic->f.data[0] ? s->last_pic : NULL, + ff_draw_horiz_band(avctx, s->cur_pic, + s->last_pic->f.data[0] ? s->last_pic : NULL, 16 * h->mb_y, 16, h->picture_structure, 0, - h->low_delay, h->mb_height * 16, h->mb_width * 16); + h->low_delay); } left = buf_size*8 - get_bits_count(&h->gb); |