summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/nullvideo.c14
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
@@ -116,7 +116,7 @@ static uint32_t null_get_capabilities( vo_driver_t *self ){
116static void null_frame_copy (vo_frame_t *vo_img, uint8_t **src) { 116static 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) {
122 /* printf("nullvideo: no video\n"); */ 122 /* printf("nullvideo: no video\n"); */
@@ -186,7 +186,7 @@ static vo_frame_t* null_alloc_frame( vo_driver_t* self ){
186 186
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;
192 192
@@ -200,7 +200,7 @@ static vo_frame_t* null_alloc_frame( vo_driver_t* self ){
200 200
201static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, 201static 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;
206 /* not needed now */ 206 /* not needed now */
@@ -215,7 +215,7 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img,
215 215
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)
221 || (this->sc.user_ratio != frame->sc.user_ratio) 221 || (this->sc.user_ratio != frame->sc.user_ratio)
@@ -224,7 +224,7 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img,
224 224
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;
230 frame->sc.user_ratio = this->sc.user_ratio; 230 frame->sc.user_ratio = this->sc.user_ratio;
@@ -355,7 +355,7 @@ static void null_display_frame( vo_driver_t* self, vo_frame_t *frame_gen ){
355 frame->bytes_per_line ); 355 frame->bytes_per_line );
356 } 356 }
357 357
358 frame->frame.displayed (&frame->frame); 358 frame->frame.free(&frame->frame);
359} 359}
360 360
361 361
@@ -486,7 +486,7 @@ xine_vo_driver_t* init_video_out_plugin( xine_t *xine,
486 486
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);
492 492