diff options
| author | albeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-07-11 20:19:00 +0000 |
|---|---|---|
| committer | albeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-07-11 20:19:00 +0000 |
| commit | 2959c060948cae8c68710ccfd0237c2d3ec26f9b (patch) | |
| tree | 4ef59b4e313d214ef56b12b269be54677db4b4c3 /libmpcodecs | |
| parent | a355761e8be12fdc803a3181fb3a8593dc7c1990 (diff) | |
| download | mpv-2959c060948cae8c68710ccfd0237c2d3ec26f9b.tar.bz2 mpv-2959c060948cae8c68710ccfd0237c2d3ec26f9b.tar.xz | |
Don't call libvo draw slice directly
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6711 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 265e7d4bde..957d3a2e6d 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -186,19 +186,17 @@ static void uninit(sh_video_t *sh){ 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 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ 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; } } |