generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '1d0feb5d1ac04d187b335f0e8d411c9f40b3a885'

Browse Source 
* commit '1d0feb5d1ac04d187b335f0e8d411c9f40b3a885':
  mpegvideo: split ff_draw_horiz_band().

Conflicts:
	libavcodec/vc1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-02-16 19:00:39 +01:00
parent 1fad547cef 1d0feb5d1a
commit ddbbfd95be
12 changed files with 84 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/vaapi.c
View File

@@ -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;