diff options
| author |  diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-02-20 08:51:53 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-02-20 08:51:53 +0000 |
| commit | 77eb726c3d388163a7be7a63f023c322700a1068 (patch) | |
| tree | 3f5997cf76aec8f060d04f32cec31f1227456386 /libvo | |
| parent | 9ae4923673f76d9673d662b32c33134123ff335d (diff) | |
Remove pointless #ifdefs around extern declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26039 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/sub.h | 4 | ||||
| -rw-r--r-- | libvo/video_out.c | 34 | ||||
| -rw-r--r-- | libvo/x11_common.h | 2 |
3 files changed, 0 insertions, 40 deletions
diff --git a/libvo/sub.h b/libvo/sub.h index ef66bb1944..f15b4e6c8d 100644 --- a/libvo/sub.h +++ b/libvo/sub.h @@ -65,12 +65,10 @@ extern subtitle* vo_sub; extern unsigned char* vo_osd_text; -#ifdef HAVE_TV_TELETEXT extern void* vo_osd_teletext_page; extern int vo_osd_teletext_half; extern int vo_osd_teletext_mode; extern int vo_osd_teletext_format; -#endif extern int vo_osd_progbar_type; extern int vo_osd_progbar_value; // 0..255 @@ -104,9 +102,7 @@ extern char * sub_osd_names_short[]; extern int sub_unicode; extern int sub_utf8; -#ifdef USE_ICONV extern char *sub_cp; -#endif extern int sub_pos; extern int sub_width_p; extern int sub_alignment; diff --git a/libvo/video_out.c b/libvo/video_out.c index 98feb468d7..286a173cb5 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -92,60 +92,26 @@ extern vo_functions_t video_out_aa; extern vo_functions_t video_out_caca; extern vo_functions_t video_out_mpegpes; extern vo_functions_t video_out_yuv4mpeg; -#ifdef HAVE_DIRECTX extern vo_functions_t video_out_directx; -#endif -#ifdef HAVE_DXR2 extern vo_functions_t video_out_dxr2; -#endif extern vo_functions_t video_out_dxr3; -#ifdef HAVE_IVTV extern vo_functions_t video_out_ivtv; -#endif -#ifdef HAVE_V4L2_DECODER extern vo_functions_t video_out_v4l2; -#endif -#ifdef HAVE_JPEG extern vo_functions_t video_out_jpeg; -#endif -#ifdef HAVE_GIF extern vo_functions_t video_out_gif89a; -#endif -#ifdef HAVE_VESA extern vo_functions_t video_out_vesa; -#endif -#ifdef HAVE_DIRECTFB extern vo_functions_t video_out_directfb; -#ifdef HAVE_DFBMGA extern vo_functions_t video_out_dfbmga; -#endif -#endif -#ifdef CONFIG_VIDIX extern vo_functions_t video_out_xvidix; extern vo_functions_t video_out_winvidix; extern vo_functions_t video_out_cvidix; -#endif -#ifdef HAVE_TDFX_VID extern vo_functions_t video_out_tdfx_vid; -#endif -#ifdef HAVE_XVR100 extern vo_functions_t video_out_xvr100; -#endif -#ifdef HAVE_TGA extern vo_functions_t video_out_tga; -#endif -#ifdef MACOSX -#ifdef MACOSX_COREVIDEO extern vo_functions_t video_out_macosx; -#endif extern vo_functions_t video_out_quartz; -#endif -#ifdef HAVE_PNM extern vo_functions_t video_out_pnm; -#endif -#ifdef HAVE_MD5SUM extern vo_functions_t video_out_md5sum; -#endif const vo_functions_t* const video_out_drivers[] = { diff --git a/libvo/x11_common.h b/libvo/x11_common.h index 73fed1f3a6..dc3a9fbd3d 100644 --- a/libvo/x11_common.h +++ b/libvo/x11_common.h @@ -108,10 +108,8 @@ int xv_test_ck( void * arg ); int xv_test_ckm( void * arg ); #endif -#ifdef HAVE_NEW_GUI extern void vo_setwindow( Window w,GC g ); extern void vo_x11_putkey(int key); -#endif void saver_off( Display * ); void saver_on( Display * ); |