author | harlekin <harlekin> | 2002-12-19 21:41:50 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-12-19 21:41:50 (UTC) |
commit | 5fd6636ba3d94b48dd543887316c47c5388a43c2 (patch) (unidiff) | |
tree | f750583ce4284ac226da90858751875a5404de6b /noncore | |
parent | d73c08dacb1abd6e02e0ff803083985bd0ca791b (diff) | |
download | opie-5fd6636ba3d94b48dd543887316c47c5388a43c2.zip opie-5fd6636ba3d94b48dd543887316c47c5388a43c2.tar.gz opie-5fd6636ba3d94b48dd543887316c47c5388a43c2.tar.bz2 |
adapted to todays xine cvs
-rw-r--r-- | noncore/multimedia/opieplayer2/nullvideo.c | 2 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/yuv2rgb.c | 4 |
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 | |||
@@ -116,6 +116,8 @@ static uint32_t null_get_capabilities( vo_driver_t *self ){ | |||
116 | static void null_frame_copy (vo_frame_t *vo_img, uint8_t **src) { | 116 | static void null_frame_copy (vo_frame_t *vo_img, uint8_t **src) { |
117 | opie_frame_t *frame = (opie_frame_t *) vo_img ; | 117 | opie_frame_t *frame = (opie_frame_t *) vo_img ; |
118 | 118 | ||
119 | vo_img->copy_called = 1; | ||
120 | |||
119 | if (!frame->output->m_show_video) { | 121 | if (!frame->output->m_show_video) { |
120 | /* printf("nullvideo: no video\n"); */ | 122 | /* printf("nullvideo: no video\n"); */ |
121 | return; | 123 | return; |
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 | |||
@@ -1207,11 +1207,11 @@ static scale_line_func_t find_scale_line_func(int step) { | |||
1207 | 1207 | ||
1208 | for (i = 0; i < sizeof(scale_line)/sizeof(scale_line[0]); i++) { | 1208 | for (i = 0; i < sizeof(scale_line)/sizeof(scale_line[0]); i++) { |
1209 | if (step == scale_line[i].src_step*32768/scale_line[i].dest_step) { | 1209 | if (step == scale_line[i].src_step*32768/scale_line[i].dest_step) { |
1210 | printf("yuv2rgb: using %s optimized scale_line\n", scale_line[i].desc); | 1210 | //printf("yuv2rgb: using %s optimized scale_line\n", scale_line[i].desc); |
1211 | return scale_line[i].func; | 1211 | return scale_line[i].func; |
1212 | } | 1212 | } |
1213 | } | 1213 | } |
1214 | printf("yuv2rgb: using generic scale_line with interpolation\n"); | 1214 | //printf("yuv2rgb: using generic scale_line with interpolation\n"); |
1215 | return scale_line_gen; | 1215 | return scale_line_gen; |
1216 | 1216 | ||
1217 | } | 1217 | } |