| -rw-r--r-- | noncore/multimedia/opieplayer2/nullvideo.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/noncore/multimedia/opieplayer2/nullvideo.c b/noncore/multimedia/opieplayer2/nullvideo.c index f28fba3..90f62f2 100644 --- a/noncore/multimedia/opieplayer2/nullvideo.c +++ b/noncore/multimedia/opieplayer2/nullvideo.c @@ -117,5 +117,5 @@ 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; + vo_img->proc_called = 1; if (!frame->output->m_show_video) { @@ -187,5 +187,5 @@ static vo_frame_t* null_alloc_frame( vo_driver_t* self ){ /* initialize the frame*/ frame->frame.driver = self; - frame->frame.copy = null_frame_copy; + frame->frame.proc_slice = null_frame_copy; frame->frame.field = null_frame_field; frame->frame.dispose = null_frame_dispose; @@ -201,5 +201,5 @@ static vo_frame_t* null_alloc_frame( vo_driver_t* self ){ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, uint32_t width, uint32_t height, - int ratio_code, int format, int flags ){ + double ratio_code, int format, int flags ){ null_driver_t* this = (null_driver_t*) self; opie_frame_t* frame = (opie_frame_t*)img; @@ -216,5 +216,5 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, if ((width != frame->sc.delivered_width) || (height != frame->sc.delivered_height) - || (ratio_code != frame->sc.delivered_ratio_code) + || (ratio_code != frame->sc.delivered_ratio) || (flags != frame->flags) || (format != frame->format) @@ -225,5 +225,5 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, frame->sc.delivered_width = width; frame->sc.delivered_height = height; - frame->sc.delivered_ratio_code = ratio_code; + frame->sc.delivered_ratio = ratio_code; frame->flags = flags; frame->format = format; @@ -356,5 +356,5 @@ static void null_display_frame( vo_driver_t* self, vo_frame_t *frame_gen ){ } - frame->frame.displayed (&frame->frame); + frame->frame.free(&frame->frame); } @@ -487,5 +487,5 @@ xine_vo_driver_t* init_video_out_plugin( xine_t *xine, /* capabilities */ - vo->m_capabilities = VO_CAP_COPIES_IMAGE | VO_CAP_YUY2 | VO_CAP_YV12; + vo->m_capabilities = /* VO_CAP_COPIES_IMAGE | */ VO_CAP_YUY2 | VO_CAP_YV12; vo->yuv2rgb_factory = yuv2rgb_factory_init (MODE_16_RGB, vo->yuv2rgb_swap, vo->yuv2rgb_cmap); |