Mercurial > mplayer.hg
changeset 6710:8898dd6c0302
Don't call libvo draw slice directly
| author | albeu |
|---|---|
| date | Thu, 11 Jul 2002 20:19:00 +0000 |
| parents | 3b20f07b2c16 |
| children | abe3f5b156f2 |
| files | libmpcodecs/vd_ffmpeg.c |
| diffstat | 1 files changed, 4 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpcodecs/vd_ffmpeg.c Thu Jul 11 20:17:27 2002 +0000 +++ b/libmpcodecs/vd_ffmpeg.c Thu Jul 11 20:19:00 2002 +0000 @@ -186,19 +186,17 @@ free(ctx); } -#include "libvo/video_out.h" // FIXME!!! - static void draw_slice(struct AVCodecContext *s, UINT8 **src, int linesize, int y, int width, int height){ - vo_functions_t * output = s->opaque; + sh_video_t * sh = s->opaque; int stride[3]; stride[0]=linesize; stride[1]=stride[2]=stride[0]/2; - output->draw_slice (src, stride, width, height, 0, y); - + mpcodecs_draw_slice (sh,src, stride, width, height, 0, y); + } // decode a frame @@ -220,7 +218,7 @@ if(mpi && mpi->flags&MP_IMGFLAG_DRAW_CALLBACK){ // vd core likes slices! avctx->draw_horiz_band=draw_slice; - avctx->opaque=sh->video_out; + avctx->opaque=sh; } }