diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 04:34:21 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 04:35:48 +0100 |
| commit | 3ddf9b5b7750bda97a591272fa0860e53b4f5c4f (patch) | |
| tree | c9175f613329f9612cd956efa3a99dad57f2163d /libavcodec/svq3.c | |
| parent | b73aae6fe9b78905635f138c931da621f83aaa31 (diff) | |
| parent | 75af13a0e4c54ee780249e16c8e14983614e2f25 (diff) | |
| download | ffmpeg-3ddf9b5b7750bda97a591272fa0860e53b4f5c4f.tar.gz | |
Merge commit '75af13a'
* commit '75af13a':
mpegvideo: directly use frames in 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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index f41fa599c3..3dd61560c8 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -1298,8 +1298,8 @@ 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, s->cur_pic, - s->last_pic->f.data[0] ? s->last_pic : NULL, + ff_draw_horiz_band(avctx, &s->cur_pic->f, + s->last_pic->f.data[0] ? &s->last_pic->f : NULL, 16 * h->mb_y, 16, h->picture_structure, 0, h->low_delay); } |