author | zecke <zecke> | 2002-07-08 21:06:22 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-07-08 21:06:22 (UTC) |
commit | 40a1b5f7519c70b5335937573e3425bbc9d0f690 (patch) (unidiff) | |
tree | 9aa449984d192b30fcf9f38d946a10ed696c0413 | |
parent | 6fc7de0c8dba90b84d65574e9d3022e10e41ddb3 (diff) | |
download | opie-40a1b5f7519c70b5335937573e3425bbc9d0f690.zip opie-40a1b5f7519c70b5335937573e3425bbc9d0f690.tar.gz opie-40a1b5f7519c70b5335937573e3425bbc9d0f690.tar.bz2 |
fix the fix
-rw-r--r-- | noncore/multimedia/opieplayer2/nullvideo.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/noncore/multimedia/opieplayer2/nullvideo.c b/noncore/multimedia/opieplayer2/nullvideo.c index 877e49a..5224862 100644 --- a/noncore/multimedia/opieplayer2/nullvideo.c +++ b/noncore/multimedia/opieplayer2/nullvideo.c | |||
@@ -1,57 +1,57 @@ | |||
1 | 1 | ||
2 | /*#include <xine.h>*/ | 2 | /*#include <xine.h>*/ |
3 | #include <stdlib.h> | 3 | #include <stdlib.h> |
4 | #include <stdio.h> | 4 | #include <stdio.h> |
5 | 5 | ||
6 | #include <video_out.h> | 6 | #include <xine/video_out.h> |
7 | #include <xine_internal.h> | 7 | #include <xine/xine_internal.h> |
8 | #include <xineutils.h> | 8 | #include <xine/xineutils.h> |
9 | #include <configfile.h> | 9 | #include <xine/configfile.h> |
10 | 10 | ||
11 | typedef struct null_driver_s null_driver_t; | 11 | typedef struct null_driver_s null_driver_t; |
12 | 12 | ||
13 | struct null_driver_s { | 13 | struct null_driver_s { |
14 | vo_driver_t vo_driver; | 14 | vo_driver_t vo_driver; |
15 | uint32_t m_capabilities; | 15 | uint32_t m_capabilities; |
16 | 16 | ||
17 | }; | 17 | }; |
18 | typedef struct opie_frame_s opie_frame_t; | 18 | typedef struct opie_frame_s opie_frame_t; |
19 | struct opie_frame_s { | 19 | struct opie_frame_s { |
20 | vo_frame_t frame; | 20 | vo_frame_t frame; |
21 | char* name; | 21 | char* name; |
22 | int version; | 22 | int version; |
23 | int m_width; | 23 | int m_width; |
24 | int m_height; | 24 | int m_height; |
25 | uint8_t *chunk[3]; | 25 | uint8_t *chunk[3]; |
26 | null_driver_t *output; | 26 | null_driver_t *output; |
27 | }; | 27 | }; |
28 | 28 | ||
29 | static uint32_t null_get_capabilities(vo_driver_t *self ){ | 29 | static uint32_t null_get_capabilities(vo_driver_t *self ){ |
30 | null_driver_t* this = (null_driver_t*)self; | 30 | null_driver_t* this = (null_driver_t*)self; |
31 | printf("capabilities\n"); | 31 | printf("capabilities\n"); |
32 | return this->m_capabilities; | 32 | return this->m_capabilities; |
33 | } | 33 | } |
34 | 34 | ||
35 | /* take care of the frame*/ | 35 | /* take care of the frame*/ |
36 | static void null_frame_dispose( vo_frame_t* vo_img){ | 36 | static void null_frame_dispose( vo_frame_t* vo_img){ |
37 | opie_frame_t* frame = (opie_frame_t*)vo_img; | 37 | opie_frame_t* frame = (opie_frame_t*)vo_img; |
38 | printf("frame_dispose\n"); | 38 | printf("frame_dispose\n"); |
39 | free (frame); | 39 | free (frame); |
40 | } | 40 | } |
41 | static void null_frame_field( vo_frame_t* frame, int inti ){ | 41 | static void null_frame_field( vo_frame_t* frame, int inti ){ |
42 | printf("frame_field\n"); | 42 | printf("frame_field\n"); |
43 | /* not needed */ | 43 | /* not needed */ |
44 | } | 44 | } |
45 | 45 | ||
46 | /* end take care of frames*/ | 46 | /* end take care of frames*/ |
47 | 47 | ||
48 | static vo_frame_t* null_alloc_frame( vo_driver_t* self ){ | 48 | static vo_frame_t* null_alloc_frame( vo_driver_t* self ){ |
49 | null_driver_t* this = (null_driver_t*)self; | 49 | null_driver_t* this = (null_driver_t*)self; |
50 | opie_frame_t* frame = (opie_frame_t*)malloc ( sizeof(opie_frame_t) ); | 50 | opie_frame_t* frame = (opie_frame_t*)malloc ( sizeof(opie_frame_t) ); |
51 | memset( frame, 0, sizeof( opie_frame_t) ); | 51 | memset( frame, 0, sizeof( opie_frame_t) ); |
52 | printf("alloc_frame\n"); | 52 | printf("alloc_frame\n"); |
53 | frame->name = "opie\0"; | 53 | frame->name = "opie\0"; |
54 | frame->version = 1; | 54 | frame->version = 1; |
55 | frame->output = this; | 55 | frame->output = this; |
56 | 56 | ||
57 | /* initialize the frame*/ | 57 | /* initialize the frame*/ |