diff options
Diffstat (limited to 'libvo')
-rw-r--r-- | libvo/aspect.h | 6 | ||||
-rw-r--r-- | libvo/fastmemcpy.h | 6 | ||||
-rw-r--r-- | libvo/font_load.h | 6 | ||||
-rw-r--r-- | libvo/geometry.h | 6 | ||||
-rw-r--r-- | libvo/gl_common.h | 6 | ||||
-rw-r--r-- | libvo/gtf.h | 6 | ||||
-rw-r--r-- | libvo/jpeg_enc.h | 6 | ||||
-rw-r--r-- | libvo/osd_font.h | 6 | ||||
-rw-r--r-- | libvo/spuenc.h | 6 | ||||
-rw-r--r-- | libvo/vesa_lvo.h | 6 | ||||
-rw-r--r-- | libvo/video_out.h | 6 | ||||
-rw-r--r-- | libvo/video_out_internal.h | 6 | ||||
-rw-r--r-- | libvo/videodev_mjpeg.h | 6 | ||||
-rw-r--r-- | libvo/vo_quartz.h | 6 | ||||
-rw-r--r-- | libvo/vosub_vidix.h | 6 | ||||
-rw-r--r-- | libvo/w32_common.h | 6 | ||||
-rw-r--r-- | libvo/wskeys.h | 6 | ||||
-rw-r--r-- | libvo/x11_common.h | 7 |
18 files changed, 54 insertions, 55 deletions
diff --git a/libvo/aspect.h b/libvo/aspect.h index cc1d0a8802..be5e4a12f8 100644 --- a/libvo/aspect.h +++ b/libvo/aspect.h @@ -1,5 +1,5 @@ -#ifndef ASPECT_H -#define ASPECT_H +#ifndef MPLAYER_ASPECT_H +#define MPLAYER_ASPECT_H /* Stuff for correct aspect scaling. */ extern int vo_panscan_x; @@ -21,4 +21,4 @@ void aspect_save_screenres(int scrw, int scrh); void aspect(int *srcw, int *srch, int zoom); void aspect_fit(int *srcw, int *srch, int fitw, int fith); -#endif /* ASPECT_H */ +#endif /* MPLAYER_ASPECT_H */ diff --git a/libvo/fastmemcpy.h b/libvo/fastmemcpy.h index e09deb4f5b..ae9d2745e1 100644 --- a/libvo/fastmemcpy.h +++ b/libvo/fastmemcpy.h @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FASTMEMCPY_H -#define FASTMEMCPY_H +#ifndef MPLAYER_FASTMEMCPY_H +#define MPLAYER_FASTMEMCPY_H #include "config.h" #include <inttypes.h> @@ -105,4 +105,4 @@ static inline void * memcpy_pic2(void * dst, const void * src, return retval; } -#endif /* FASTMEMCPY_H */ +#endif /* MPLAYER_FASTMEMCPY_H */ diff --git a/libvo/font_load.h b/libvo/font_load.h index 2d24e79023..0c7fe42890 100644 --- a/libvo/font_load.h +++ b/libvo/font_load.h @@ -1,5 +1,5 @@ -#ifndef FONT_LOAD_H -#define FONT_LOAD_H +#ifndef MPLAYER_FONT_LOAD_H +#define MPLAYER_FONT_LOAD_H #ifdef HAVE_FREETYPE #include <ft2build.h> @@ -102,4 +102,4 @@ static int kerning(font_desc_t *desc, int prevc, int c) { return 0; } raw_file* load_raw(char *name,int verbose); font_desc_t* read_font_desc(const char* fname,float factor,int verbose); -#endif /* FONT_LOAD_H */ +#endif /* MPLAYER_FONT_LOAD_H */ diff --git a/libvo/geometry.h b/libvo/geometry.h index da4026a166..50080b3dd0 100644 --- a/libvo/geometry.h +++ b/libvo/geometry.h @@ -1,10 +1,10 @@ /* This file (C) Mark Zealey <mark@zealos.org 2002, released under GPL */ -#ifndef GEOMETRY_H -#define GEOMETRY_H +#ifndef MPLAYER_GEOMETRY_H +#define MPLAYER_GEOMETRY_H extern char *vo_geometry; extern int geometry_wh_changed; extern int geometry_xy_changed; int geometry(int *xpos, int *ypos, int *widw, int *widh, int scrw, int scrh); -#endif /* GEOMETRY_H */ +#endif /* MPLAYER_GEOMETRY_H */ diff --git a/libvo/gl_common.h b/libvo/gl_common.h index 5025c0a4e0..8e0d416d48 100644 --- a/libvo/gl_common.h +++ b/libvo/gl_common.h @@ -1,5 +1,5 @@ -#ifndef GL_COMMON_H -#define GL_COMMON_H +#ifndef MPLAYER_GL_COMMON_H +#define MPLAYER_GL_COMMON_H #include "mp_msg.h" #include "config.h" @@ -330,4 +330,4 @@ extern int (APIENTRY *SwapInterval)(int); extern void (APIENTRY *TexImage3D)(GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *); -#endif /* GL_COMMON_H */ +#endif /* MPLAYER_GL_COMMON_H */ diff --git a/libvo/gtf.h b/libvo/gtf.h index d898462735..3928ad9be2 100644 --- a/libvo/gtf.h +++ b/libvo/gtf.h @@ -1,5 +1,5 @@ -#ifndef GTF_H -#define GTF_H +#ifndef MPLAYER_GTF_H +#define MPLAYER_GTF_H #include <vbe.h> @@ -45,4 +45,4 @@ typedef struct { void GTF_calcTimings(double X,double Y,double freq, int type, int want_margins, int want_interlace,struct VesaCRTCInfoBlock *result); -#endif /* GTF_H */ +#endif /* MPLAYER_GTF_H */ diff --git a/libvo/jpeg_enc.h b/libvo/jpeg_enc.h index 923b431a9b..b518fb4bbf 100644 --- a/libvo/jpeg_enc.h +++ b/libvo/jpeg_enc.h @@ -22,8 +22,8 @@ * http://www.ece.purdue.edu/~bourman/grad-labs/lab8/pdf/lab.pdf */ -#ifndef JPEG_ENC_H -#define JPEG_ENC_H +#ifndef MPLAYER_JPEG_ENC_H +#define MPLAYER_JPEG_ENC_H typedef struct { struct MpegEncContext *s; @@ -46,4 +46,4 @@ int jpeg_enc_frame(jpeg_enc_t *j, unsigned char *y_data, void jpeg_enc_uninit(jpeg_enc_t *j); -#endif /* JPEG_ENC_H */ +#endif /* MPLAYER_JPEG_ENC_H */ diff --git a/libvo/osd_font.h b/libvo/osd_font.h index 1ba24e9056..99d162060c 100644 --- a/libvo/osd_font.h +++ b/libvo/osd_font.h @@ -1,5 +1,5 @@ -#ifndef OSD_FONT_H -#define OSD_FONT_H +#ifndef MPLAYER_OSD_FONT_H +#define MPLAYER_OSD_FONT_H const unsigned char osd_font_pfb[] = { 0x80,0x01,0x02,0x17,0x00,0x00,0x25,0x21,0x50,0x53,0x2d,0x41,0x64,0x6f,0x62,0x65, @@ -524,4 +524,4 @@ const unsigned char osd_font_pfb[] = { 0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x0a, 0x80,0x03,}; -#endif /* OSD_FONT_H */ +#endif /* MPLAYER_OSD_FONT_H */ diff --git a/libvo/spuenc.h b/libvo/spuenc.h index 40692fbfab..3fb3e62e2d 100644 --- a/libvo/spuenc.h +++ b/libvo/spuenc.h @@ -19,8 +19,8 @@ * */ -#ifndef SPUENC_H -#define SPUENC_H +#ifndef MPLAYER_SPUENC_H +#define MPLAYER_SPUENC_H #include <stdlib.h> #define DATASIZE 53220 @@ -42,4 +42,4 @@ typedef struct { void pixbuf_encode_rle(int x, int y, int w, int h, char *inbuf, int stride, encodedata *ed); void pixbuf_delete(pixbuf* pb); -#endif /* SPUENC_H */ +#endif /* MPLAYER_SPUENC_H */ diff --git a/libvo/vesa_lvo.h b/libvo/vesa_lvo.h index 4a4550c417..51cecbc158 100644 --- a/libvo/vesa_lvo.h +++ b/libvo/vesa_lvo.h @@ -9,8 +9,8 @@ * This file contains vo_vesa interface to Linux Video Overlay. */ -#ifndef VESA_LVO_H -#define VESA_LVO_H +#ifndef MPLAYER_VESA_LVO_H +#define MPLAYER_VESA_LVO_H int vlvo_preinit(const char *drvname); int vlvo_init(unsigned src_width,unsigned src_height, @@ -24,4 +24,4 @@ uint32_t vlvo_draw_frame(uint8_t *src[]); void vlvo_flip_page(void); void vlvo_draw_osd(void); -#endif /* VESA_LVO_H */ +#endif /* MPLAYER_VESA_LVO_H */ diff --git a/libvo/video_out.h b/libvo/video_out.h index 958689fc08..48799c484d 100644 --- a/libvo/video_out.h +++ b/libvo/video_out.h @@ -7,8 +7,8 @@ * */ -#ifndef VIDEO_OUT_H -#define VIDEO_OUT_H +#ifndef MPLAYER_VIDEO_OUT_H +#define MPLAYER_VIDEO_OUT_H #include <inttypes.h> #include <stdarg.h> @@ -255,4 +255,4 @@ extern char *monitor_dotclock_str; #endif /* defined(HAVE_FBDEV) || defined(HAVE_VESA) */ -#endif /* VIDEO_OUT_H */ +#endif /* MPLAYER_VIDEO_OUT_H */ diff --git a/libvo/video_out_internal.h b/libvo/video_out_internal.h index 5d51909b95..53fd286957 100644 --- a/libvo/video_out_internal.h +++ b/libvo/video_out_internal.h @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef VIDEO_OUT_INTERNAL_H -#define VIDEO_OUT_INTERNAL_H +#ifndef MPLAYER_VIDEO_OUT_INTERNAL_H +#define MPLAYER_VIDEO_OUT_INTERNAL_H /* All video drivers will want this */ #include "libmpcodecs/vfcap.h" @@ -57,4 +57,4 @@ static int preinit(const char *); #include "osd.h" -#endif /* VIDEO_OUT_INTERNAL_H */ +#endif /* MPLAYER_VIDEO_OUT_INTERNAL_H */ diff --git a/libvo/videodev_mjpeg.h b/libvo/videodev_mjpeg.h index 9f8c30234c..752eeb104d 100644 --- a/libvo/videodev_mjpeg.h +++ b/libvo/videodev_mjpeg.h @@ -3,8 +3,8 @@ <rainer@johanni.de> */ -#ifndef VIDEODEV_MJPEG_H -#define VIDEODEV_MJPEG_H +#ifndef MPLAYER_VIDEODEV_MJPEG_H +#define MPLAYER_VIDEODEV_MJPEG_H /* This is identical with the mgavideo internal params struct, please tell me if you change this struct here ! <gz@lysator.liu.se) */ @@ -120,4 +120,4 @@ Private IOCTL to set up for displaying MJPEG #define MJPIOC_SYNC _IOR ('v', BASE_VIDIOCPRIVATE+5, struct mjpeg_sync) #define MJPIOC_G_STATUS _IOWR('v', BASE_VIDIOCPRIVATE+6, struct mjpeg_status) -#endif /* VIDEODEV_MJPEG_H */ +#endif /* MPLAYER_VIDEODEV_MJPEG_H */ diff --git a/libvo/vo_quartz.h b/libvo/vo_quartz.h index 4213eaf2a1..b0e8fece46 100644 --- a/libvo/vo_quartz.h +++ b/libvo/vo_quartz.h @@ -26,8 +26,8 @@ slouken@libsdl.org */ -#ifndef VO_QUARTZ_H -#define VO_QUARTZ_H +#ifndef MPLAYER_VO_QUARTZ_H +#define MPLAYER_VO_QUARTZ_H /* These are the Macintosh key scancode constants -- from Inside Macintosh */ #define QZ_ESCAPE 0x35 @@ -149,4 +149,4 @@ #define QZ_IBOOK_DOWN 0x3D #define QZ_IBOOK_UP 0x3E -#endif /* VO_QUARTZ_H */ +#endif /* MPLAYER_VO_QUARTZ_H */ diff --git a/libvo/vosub_vidix.h b/libvo/vosub_vidix.h index acd0bc45a6..a1d31285b9 100644 --- a/libvo/vosub_vidix.h +++ b/libvo/vosub_vidix.h @@ -9,8 +9,8 @@ * This file contains vosub_vidix interface to any mplayer's VO driver */ -#ifndef VOSUB_VIDIX_H -#define VOSUB_VIDIX_H +#ifndef MPLAYER_VOSUB_VIDIX_H +#define MPLAYER_VOSUB_VIDIX_H /* drvname can be NULL */ int vidix_preinit(const char *drvname,vo_functions_t *server); @@ -35,4 +35,4 @@ int vidix_grkey_support(void); int vidix_grkey_get(vidix_grkey_t *gr_key); int vidix_grkey_set(const vidix_grkey_t *gr_key); -#endif /* VOSUB_VIDIX_H */ +#endif /* MPLAYER_VOSUB_VIDIX_H */ diff --git a/libvo/w32_common.h b/libvo/w32_common.h index 0787677207..449fd0d98e 100644 --- a/libvo/w32_common.h +++ b/libvo/w32_common.h @@ -1,5 +1,5 @@ -#ifndef W32_COMMON_H -#define W32_COMMON_H +#ifndef MPLAYER_W32_COMMON_H +#define MPLAYER_W32_COMMON_H extern HWND vo_w32_window; extern int vo_vm; @@ -14,4 +14,4 @@ extern int vo_w32_config(uint32_t, uint32_t, uint32_t); extern void destroyRenderingContext(void); extern void w32_update_xinerama_info(void); -#endif /* W32_COMMON_H */ +#endif /* MPLAYER_W32_COMMON_H */ diff --git a/libvo/wskeys.h b/libvo/wskeys.h index 194ce10f0d..f226ccc2e9 100644 --- a/libvo/wskeys.h +++ b/libvo/wskeys.h @@ -1,6 +1,6 @@ -#ifndef WSKEYS_H -#define WSKEYS_H +#ifndef MPLAYER_WSKEYS_H +#define MPLAYER_WSKEYS_H #define wsosbrackets '[' #define wscsbrackets ']' @@ -152,4 +152,4 @@ #define wsGrayInsert 0x9e + 256 #define wsGrayDelete 0x9f + 256 -#endif /* WSKEYS_H */ +#endif /* MPLAYER_WSKEYS_H */ diff --git a/libvo/x11_common.h b/libvo/x11_common.h index dc3a9fbd3d..2c52eb3163 100644 --- a/libvo/x11_common.h +++ b/libvo/x11_common.h @@ -1,6 +1,5 @@ - -#ifndef X11_COMMON_H -#define X11_COMMON_H +#ifndef MPLAYER_X11_COMMON_H +#define MPLAYER_X11_COMMON_H #include <X11/Xlib.h> #include <X11/Xutil.h> @@ -123,4 +122,4 @@ void update_xinerama_info(void); int vo_find_depth_from_visuals(Display *dpy, int screen, Visual **visual_return); -#endif /* X11_COMMON_H */ +#endif /* MPLAYER_X11_COMMON_H */ |