summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-12-19 21:41:50 (UTC)
committer harlekin <harlekin>2002-12-19 21:41:50 (UTC)
commit5fd6636ba3d94b48dd543887316c47c5388a43c2 (patch) (side-by-side diff)
treef750583ce4284ac226da90858751875a5404de6b
parentd73c08dacb1abd6e02e0ff803083985bd0ca791b (diff)
downloadopie-5fd6636ba3d94b48dd543887316c47c5388a43c2.zip
opie-5fd6636ba3d94b48dd543887316c47c5388a43c2.tar.gz
opie-5fd6636ba3d94b48dd543887316c47c5388a43c2.tar.bz2
adapted to todays xine cvs
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/nullvideo.c2
-rw-r--r--noncore/multimedia/opieplayer2/yuv2rgb.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/noncore/multimedia/opieplayer2/nullvideo.c b/noncore/multimedia/opieplayer2/nullvideo.c
index a49f9d3..095f206 100644
--- a/noncore/multimedia/opieplayer2/nullvideo.c
+++ b/noncore/multimedia/opieplayer2/nullvideo.c
@@ -107,24 +107,26 @@ struct opie_frame_s {
null_driver_t *output;
};
static uint32_t null_get_capabilities( vo_driver_t *self ){
null_driver_t* this = (null_driver_t*)self;
return this->m_capabilities;
}
static void null_frame_copy (vo_frame_t *vo_img, uint8_t **src) {
opie_frame_t *frame = (opie_frame_t *) vo_img ;
+ vo_img->copy_called = 1;
+
if (!frame->output->m_show_video) {
/* printf("nullvideo: no video\n"); */
return;
}
if (frame->format == XINE_IMGFMT_YV12) {
frame->yuv2rgb->yuv2rgb_fun (frame->yuv2rgb, frame->rgb_dst,
src[0], src[1], src[2]);
} else {
frame->yuv2rgb->yuy22rgb_fun (frame->yuv2rgb, frame->rgb_dst,
src[0]);
diff --git a/noncore/multimedia/opieplayer2/yuv2rgb.c b/noncore/multimedia/opieplayer2/yuv2rgb.c
index e8e86e6..8e34052 100644
--- a/noncore/multimedia/opieplayer2/yuv2rgb.c
+++ b/noncore/multimedia/opieplayer2/yuv2rgb.c
@@ -1198,29 +1198,29 @@ static scale_line_func_t find_scale_line_func(int step) {
{ 45, 53, scale_line_45_53, "dvd 16:9(ntsc)" },
{ 11, 12, scale_line_11_12, "vcd 4:3(pal)" },
{ 11, 24, scale_line_11_24, "vcd 4:3(pal) 2*zoom" },
{ 5, 8, scale_line_5_8, "svcd 4:3(pal)" },
{ 3, 4, scale_line_3_4, "svcd 4:3(ntsc)" },
{ 1, 2, scale_line_1_2, "2*zoom" },
{ 1, 1, scale_line_1_1, "non-scaled" },
};
int i;
for (i = 0; i < sizeof(scale_line)/sizeof(scale_line[0]); i++) {
if (step == scale_line[i].src_step*32768/scale_line[i].dest_step) {
- printf("yuv2rgb: using %s optimized scale_line\n", scale_line[i].desc);
+ //printf("yuv2rgb: using %s optimized scale_line\n", scale_line[i].desc);
return scale_line[i].func;
}
}
- printf("yuv2rgb: using generic scale_line with interpolation\n");
+ //printf("yuv2rgb: using generic scale_line with interpolation\n");
return scale_line_gen;
}
static void scale_line_2 (uint8_t *source, uint8_t *dest,
int width, int step) {
int p1;
int p2;
int dx;
p1 = *source; source+=2;