From e27d606714997a74b94842a55c1f8bef3bbc6c75 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 6 Jan 2008 23:20:15 +0000 Subject: Fix illegal identifiers: Names starting with __ or _ and uppercase are reserved for the system, names starting with _ are reserved at file level. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25635 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/aviheader.h | 8 ++++---- libmpdemux/demux_film.c | 4 ++-- libmpdemux/demux_lmlm4.c | 2 +- libmpdemux/demux_nuv.c | 6 +++--- libmpdemux/demux_xmms_plugin.h | 4 ++-- libmpdemux/yuv4mpeg.h | 8 ++++---- 6 files changed, 16 insertions(+), 16 deletions(-) (limited to 'libmpdemux') diff --git a/libmpdemux/aviheader.h b/libmpdemux/aviheader.h index 7a2f96c124..581e1c9b39 100644 --- a/libmpdemux/aviheader.h +++ b/libmpdemux/aviheader.h @@ -120,19 +120,19 @@ typedef struct } AVIINDEXENTRY; -typedef struct _avisuperindex_entry { +typedef struct avisuperindex_entry { uint64_t qwOffset; // absolute file offset uint32_t dwSize; // size of index chunk at this offset uint32_t dwDuration; // time span in stream ticks } avisuperindex_entry; -typedef struct _avistdindex_entry { +typedef struct avistdindex_entry { uint32_t dwOffset; // qwBaseOffset + this is absolute file offset uint32_t dwSize; // bit 31 is set if this is NOT a keyframe } avistdindex_entry; // Standard index -typedef struct __attribute__((packed)) _avistdindex_chunk { +typedef struct __attribute__((packed)) avistdindex_chunk { char fcc[4]; // ix## uint32_t dwSize; // size of this chunk uint16_t wLongsPerEntry; // must be sizeof(aIndex[0])/sizeof(DWORD) @@ -147,7 +147,7 @@ typedef struct __attribute__((packed)) _avistdindex_chunk { // Base Index Form 'indx' -typedef struct _avisuperindex_chunk { +typedef struct avisuperindex_chunk { char fcc[4]; uint32_t dwSize; // size of this chunk uint16_t wLongsPerEntry; // size of each entry in aIndex array (must be 4*4 for us) diff --git a/libmpdemux/demux_film.c b/libmpdemux/demux_film.c index be2c5ab43b..fe2c287001 100644 --- a/libmpdemux/demux_film.c +++ b/libmpdemux/demux_film.c @@ -27,7 +27,7 @@ #define CHUNK_FDSC mmioFOURCC('F', 'D', 'S', 'C') #define CHUNK_STAB mmioFOURCC('S', 'T', 'A', 'B') -typedef struct _film_chunk_t +typedef struct film_chunk_t { off_t chunk_offset; int chunk_size; @@ -37,7 +37,7 @@ typedef struct _film_chunk_t float pts; } film_chunk_t; -typedef struct _film_data_t +typedef struct film_data_t { unsigned int total_chunks; unsigned int current_chunk; diff --git a/libmpdemux/demux_lmlm4.c b/libmpdemux/demux_lmlm4.c index 9ae76d3da4..84bca8731d 100644 --- a/libmpdemux/demux_lmlm4.c +++ b/libmpdemux/demux_lmlm4.c @@ -17,7 +17,7 @@ #include "demuxer.h" #include "stheader.h" -typedef struct __FrameInfo +typedef struct FrameInfo { ssize_t frameSize; ssize_t paddingSize; diff --git a/libmpdemux/demux_nuv.c b/libmpdemux/demux_nuv.c index b9cfdd0782..5e33412d93 100644 --- a/libmpdemux/demux_nuv.c +++ b/libmpdemux/demux_nuv.c @@ -25,9 +25,9 @@ struct nuv_signature char version[5]; /* "0.05" + \0 */ }; -typedef struct _nuv_position_t nuv_position_t; +typedef struct nuv_position_t nuv_position_t; -struct _nuv_position_t +struct nuv_position_t { off_t offset; float time; @@ -35,7 +35,7 @@ struct _nuv_position_t nuv_position_t* next; }; -typedef struct _nuv_info_t +typedef struct nuv_info_t { int current_audio_frame; int current_video_frame; diff --git a/libmpdemux/demux_xmms_plugin.h b/libmpdemux/demux_xmms_plugin.h index c2b1b8351c..5aa176f952 100644 --- a/libmpdemux/demux_xmms_plugin.h +++ b/libmpdemux/demux_xmms_plugin.h @@ -133,7 +133,7 @@ typedef struct } GeneralPlugin; -typedef struct _VisPlugin +typedef struct VisPlugin { void *handle; /* Filled in by xmms */ char *filename; /* Filled in by xmms */ @@ -145,7 +145,7 @@ typedef struct _VisPlugin void (*cleanup)(void); /* Called when the plugin is disabled */ void (*about)(void); /* Show the about box */ void (*configure)(void); /* Show the configure box */ - void (*disable_plugin)(struct _VisPlugin *); /* Call this with a pointer to your plugin to disable the plugin */ + void (*disable_plugin)(struct VisPlugin *); /* Call this with a pointer to your plugin to disable the plugin */ void (*playback_start)(void); /* Called when playback starts */ void (*playback_stop)(void); /* Called when playback stops */ void (*render_pcm)(short pcm_data[2][512]); /* Render the PCM data, don't do anything time consuming in here */ diff --git a/libmpdemux/yuv4mpeg.h b/libmpdemux/yuv4mpeg.h index 2db6136ce1..157d426c0e 100644 --- a/libmpdemux/yuv4mpeg.h +++ b/libmpdemux/yuv4mpeg.h @@ -55,7 +55,7 @@ * 'ratio' datatype, for rational numbers * (see 'ratio' functions down below) ************************************************************************/ -typedef struct _y4m_ratio { +typedef struct y4m_ratio { int n; /* numerator */ int d; /* denominator */ } y4m_ratio_t; @@ -99,7 +99,7 @@ extern const y4m_ratio_t y4m_sar_PAL_SVCD_16_9; /* PAL SVCD 16:9 */ ************************************************************************/ #define Y4M_MAX_XTAGS 32 /* maximum number of xtags in list */ #define Y4M_MAX_XTAG_SIZE 32 /* max length of an xtag (including 'X') */ -typedef struct _y4m_xtag_list { +typedef struct y4m_xtag_list { int count; char *tags[Y4M_MAX_XTAGS]; } y4m_xtag_list_t; @@ -114,7 +114,7 @@ typedef struct _y4m_xtag_list { * Use the y4m_si_*() functions (see below). * You must initialize/finalize this structure before/after use. ************************************************************************/ -typedef struct _y4m_stream_info { +typedef struct y4m_stream_info { /* values from header */ int width; int height; @@ -141,7 +141,7 @@ typedef struct _y4m_stream_info { * Use the y4m_fi_*() functions (see below). * You must initialize/finalize this structure before/after use. ************************************************************************/ -typedef struct _y4m_frame_info { +typedef struct y4m_frame_info { /* mystical X tags */ y4m_xtag_list_t x_tags; } y4m_frame_info_t; -- cgit v1.2.3