From 2bd0d969a66f250e35319f553068b78b0adedc5d Mon Sep 17 00:00:00 2001 From: ben Date: Fri, 20 Jun 2008 19:33:32 +0000 Subject: allow conditionnal compilation of yuv4mpeg video out. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27103 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/video_out.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'libvo') diff --git a/libvo/video_out.c b/libvo/video_out.c index 762ef7cdcb..5496eeb59a 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -221,7 +221,9 @@ const vo_functions_t* const video_out_drivers[] = &video_out_xvmc, #endif &video_out_mpegpes, +#ifdef HAVE_YUV4MPEG &video_out_yuv4mpeg, +#endif #ifdef HAVE_PNG &video_out_png, #endif -- cgit v1.2.3 From 144b0d05cdd58f45a1876cfa704f59c2653d23bc Mon Sep 17 00:00:00 2001 From: ben Date: Fri, 20 Jun 2008 20:16:34 +0000 Subject: remove now useless vidixlib.h file git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27111 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/vo_cvidix.c | 2 +- libvo/vo_winvidix.c | 2 +- libvo/vo_xvidix.c | 2 +- libvo/vosub_vidix.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'libvo') diff --git a/libvo/vo_cvidix.c b/libvo/vo_cvidix.c index 0192b20264..0f7de905dc 100644 --- a/libvo/vo_cvidix.c +++ b/libvo/vo_cvidix.c @@ -23,7 +23,7 @@ #include "mp_msg.h" #include "vosub_vidix.h" -#include "vidix/vidixlib.h" +#include "vidix/vidix.h" static const vo_info_t info = { diff --git a/libvo/vo_winvidix.c b/libvo/vo_winvidix.c index eb42f3d476..b03b1b2ded 100644 --- a/libvo/vo_winvidix.c +++ b/libvo/vo_winvidix.c @@ -25,7 +25,7 @@ #include "mp_fifo.h" #include "vosub_vidix.h" -#include "vidix/vidixlib.h" +#include "vidix/vidix.h" static const vo_info_t info = diff --git a/libvo/vo_xvidix.c b/libvo/vo_xvidix.c index f330eb9521..c56e52d4cf 100644 --- a/libvo/vo_xvidix.c +++ b/libvo/vo_xvidix.c @@ -31,7 +31,7 @@ #include "mp_msg.h" #include "vosub_vidix.h" -#include "vidix/vidixlib.h" +#include "vidix/vidix.h" #ifdef HAVE_NEW_GUI #include "gui/interface.h" diff --git a/libvo/vosub_vidix.c b/libvo/vosub_vidix.c index 4bebbb0000..fec1d9ce32 100644 --- a/libvo/vosub_vidix.c +++ b/libvo/vosub_vidix.c @@ -27,7 +27,7 @@ #include "mp_msg.h" #include "help_mp.h" -#include "vidix/vidixlib.h" +#include "vidix/vidix.h" #include "fastmemcpy.h" #include "osd.h" #include "video_out.h" -- cgit v1.2.3 From b40e5e88d586096db2deabe901e5523f76eb7b55 Mon Sep 17 00:00:00 2001 From: ben Date: Fri, 20 Jun 2008 20:28:50 +0000 Subject: remove useless typedef againstfor VDXContext git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27116 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/vosub_vidix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libvo') diff --git a/libvo/vosub_vidix.c b/libvo/vosub_vidix.c index fec1d9ce32..e2b7d10634 100644 --- a/libvo/vosub_vidix.c +++ b/libvo/vosub_vidix.c @@ -39,7 +39,7 @@ #define NUM_FRAMES VID_PLAY_MAXFRAMES /* Temporary: driver will overwrite it */ -static VDL_HANDLE vidix_handler = NULL; +static VDXContext *vidix_handler = NULL; static uint8_t *vidix_mem = NULL; static uint8_t next_frame; static unsigned image_Bpp,image_height,image_width,src_format,forced_fourcc=0; -- cgit v1.2.3 From bbcf93faeecf04955e7d4157326a26f0cd567ea6 Mon Sep 17 00:00:00 2001 From: reimar Date: Sun, 22 Jun 2008 07:25:48 +0000 Subject: 100l, bpp is bits per pixel, not bytes git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27121 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/vo_gl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libvo') diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index 693c96f1d8..d9097302c3 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -733,8 +733,8 @@ static uint32_t draw_image(mp_image_t *mpi) { mpi2.flags = 0; mpi2.type = MP_IMGTYPE_TEMP; mpi2.width = mpi2.w; mpi2.height = mpi2.h; if (force_pbo && !(mpi->flags & MP_IMGFLAG_DIRECT) && !gl_bufferptr && get_image(&mpi2) == VO_TRUE) { - int bpp = mpi->imgfmt == IMGFMT_YV12 ? 1 : mpi->bpp; - memcpy_pic(mpi2.planes[0], mpi->planes[0], mpi->w * bpp, mpi->h, mpi2.stride[0], mpi->stride[0]); + int bpp = mpi->imgfmt == IMGFMT_YV12 ? 8 : mpi->bpp; + memcpy_pic(mpi2.planes[0], mpi->planes[0], mpi->w * bpp / 8, mpi->h, mpi2.stride[0], mpi->stride[0]); if (mpi->imgfmt == IMGFMT_YV12) { memcpy_pic(mpi2.planes[1], mpi->planes[1], mpi->w >> 1, mpi->h >> 1, mpi2.stride[1], mpi->stride[1]); memcpy_pic(mpi2.planes[2], mpi->planes[2], mpi->w >> 1, mpi->h >> 1, mpi2.stride[2], mpi->stride[2]); -- cgit v1.2.3