author | mickeyl <mickeyl> | 2004-09-20 20:56:14 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-09-20 20:56:14 (UTC) |
commit | 5c96d26bccfeeb34a639054bf8abe41af687d3c5 (patch) (unidiff) | |
tree | e048d68785ef9f33eff56700f9f631ffc19af53f | |
parent | a99238645ef9d50fb79c6fb7c7185d0dce013e13 (diff) | |
download | opie-5c96d26bccfeeb34a639054bf8abe41af687d3c5.zip opie-5c96d26bccfeeb34a639054bf8abe41af687d3c5.tar.gz opie-5c96d26bccfeeb34a639054bf8abe41af687d3c5.tar.bz2 |
catch up with recent libxine API changes
-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) { | |||
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; | 119 | vo_img->proc_called = 1; |
120 | 120 | ||
121 | if (!frame->output->m_show_video) { | 121 | if (!frame->output->m_show_video) { |
@@ -187,5 +187,5 @@ static vo_frame_t* null_alloc_frame( vo_driver_t* self ){ | |||
187 | /* initialize the frame*/ | 187 | /* initialize the frame*/ |
188 | frame->frame.driver = self; | 188 | frame->frame.driver = self; |
189 | frame->frame.copy = null_frame_copy; | 189 | frame->frame.proc_slice = null_frame_copy; |
190 | frame->frame.field = null_frame_field; | 190 | frame->frame.field = null_frame_field; |
191 | frame->frame.dispose = null_frame_dispose; | 191 | frame->frame.dispose = null_frame_dispose; |
@@ -201,5 +201,5 @@ static vo_frame_t* null_alloc_frame( vo_driver_t* self ){ | |||
201 | static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, | 201 | static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, |
202 | uint32_t width, uint32_t height, | 202 | uint32_t width, uint32_t height, |
203 | int ratio_code, int format, int flags ){ | 203 | double ratio_code, int format, int flags ){ |
204 | null_driver_t* this = (null_driver_t*) self; | 204 | null_driver_t* this = (null_driver_t*) self; |
205 | opie_frame_t* frame = (opie_frame_t*)img; | 205 | 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, | |||
216 | if ((width != frame->sc.delivered_width) | 216 | if ((width != frame->sc.delivered_width) |
217 | || (height != frame->sc.delivered_height) | 217 | || (height != frame->sc.delivered_height) |
218 | || (ratio_code != frame->sc.delivered_ratio_code) | 218 | || (ratio_code != frame->sc.delivered_ratio) |
219 | || (flags != frame->flags) | 219 | || (flags != frame->flags) |
220 | || (format != frame->format) | 220 | || (format != frame->format) |
@@ -225,5 +225,5 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, | |||
225 | frame->sc.delivered_width = width; | 225 | frame->sc.delivered_width = width; |
226 | frame->sc.delivered_height = height; | 226 | frame->sc.delivered_height = height; |
227 | frame->sc.delivered_ratio_code = ratio_code; | 227 | frame->sc.delivered_ratio = ratio_code; |
228 | frame->flags = flags; | 228 | frame->flags = flags; |
229 | frame->format = format; | 229 | frame->format = format; |
@@ -356,5 +356,5 @@ static void null_display_frame( vo_driver_t* self, vo_frame_t *frame_gen ){ | |||
356 | } | 356 | } |
357 | 357 | ||
358 | frame->frame.displayed (&frame->frame); | 358 | frame->frame.free(&frame->frame); |
359 | } | 359 | } |
360 | 360 | ||
@@ -487,5 +487,5 @@ xine_vo_driver_t* init_video_out_plugin( xine_t *xine, | |||
487 | 487 | ||
488 | /* capabilities */ | 488 | /* capabilities */ |
489 | vo->m_capabilities = VO_CAP_COPIES_IMAGE | VO_CAP_YUY2 | VO_CAP_YV12; | 489 | vo->m_capabilities = /* VO_CAP_COPIES_IMAGE | */ VO_CAP_YUY2 | VO_CAP_YV12; |
490 | vo->yuv2rgb_factory = yuv2rgb_factory_init (MODE_16_RGB, vo->yuv2rgb_swap, | 490 | vo->yuv2rgb_factory = yuv2rgb_factory_init (MODE_16_RGB, vo->yuv2rgb_swap, |
491 | vo->yuv2rgb_cmap); | 491 | vo->yuv2rgb_cmap); |