diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-16 19:00:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-16 19:00:39 +0100 |
| commit | ddbbfd95bee4105fcb75f3b7c039b6c08efe36b4 (patch) | |
| tree | 6b89fa0cc6e1afa4f4e6f5fe8275ef54984bd9da /libavcodec/vaapi.c | |
| parent | 1fad547cefb4d2f3ed3d764b547ee16cf399e477 (diff) | |
| parent | 1d0feb5d1ac04d187b335f0e8d411c9f40b3a885 (diff) | |
Merge commit '1d0feb5d1ac04d187b335f0e8d411c9f40b3a885'
* commit '1d0feb5d1ac04d187b335f0e8d411c9f40b3a885':
mpegvideo: split ff_draw_horiz_band().
Conflicts:
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vaapi.c')
| -rw-r--r-- | libavcodec/vaapi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vaapi.c b/libavcodec/vaapi.c index 774fde840f..1cbb3378cf 100644 --- a/libavcodec/vaapi.c +++ b/libavcodec/vaapi.c @@ -187,7 +187,7 @@ int ff_vaapi_common_end_frame(MpegEncContext *s) if (vactx->n_slice_buf_ids > 0) { if (render_picture(vactx, ff_vaapi_get_surface_id(s->current_picture_ptr)) < 0) goto done; - ff_draw_horiz_band(s, 0, s->avctx->height); + ff_mpeg_draw_horiz_band(s, 0, s->avctx->height); } ret = 0; |