Mercurial > mplayer.hg
comparison libvo/vo_gl2.c @ 7931:48c71b6c7389
vo_init() moved to/fixed in preinit()
| author | arpi |
|---|---|
| date | Sun, 27 Oct 2002 03:16:21 +0000 |
| parents | cdb43addad4c |
| children | 143d730908ae |
comparison
equal
deleted
inserted
replaced
| 7930:a77aff3d7ac0 | 7931:48c71b6c7389 |
|---|---|
| 620 | 620 |
| 621 image_height = height; | 621 image_height = height; |
| 622 image_width = width; | 622 image_width = width; |
| 623 image_format = format; | 623 image_format = format; |
| 624 | 624 |
| 625 if(!vo_init()) return -1; | |
| 626 | |
| 627 aspect_save_orig(width,height); | 625 aspect_save_orig(width,height); |
| 628 aspect_save_prescale(d_width,d_height); | 626 aspect_save_prescale(d_width,d_height); |
| 629 aspect_save_screenres(vo_screenwidth,vo_screenheight); | 627 aspect_save_screenres(vo_screenwidth,vo_screenheight); |
| 630 | 628 |
| 631 aspect(&d_width,&d_height,A_NOZOOM); | 629 aspect(&d_width,&d_height,A_NOZOOM); |
| 1106 if(arg) | 1104 if(arg) |
| 1107 { | 1105 { |
| 1108 printf("[gl2] Unknown subdevice: %s\n",arg); | 1106 printf("[gl2] Unknown subdevice: %s\n",arg); |
| 1109 return ENOSYS; | 1107 return ENOSYS; |
| 1110 } | 1108 } |
| 1109 if( !vo_init() ) return -1; // Can't open X11 | |
| 1111 return 0; | 1110 return 0; |
| 1112 } | 1111 } |
| 1113 | 1112 |
| 1114 static uint32_t control(uint32_t request, void *data, ...) | 1113 static uint32_t control(uint32_t request, void *data, ...) |
| 1115 { | 1114 { |