mirror of https://github.com/mpv-player/mpv
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
This commit is contained in:
parent
3dc7792ae3
commit
e27d606714
|
@ -1,14 +1,14 @@
|
||||||
#ifndef ASXPARSER_H
|
#ifndef ASXPARSER_H
|
||||||
#define ASXPARSER_H
|
#define ASXPARSER_H
|
||||||
|
|
||||||
typedef struct _ASX_Parser_t ASX_Parser_t;
|
typedef struct ASX_Parser_t ASX_Parser_t;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
char* buffer;
|
char* buffer;
|
||||||
int line;
|
int line;
|
||||||
} ASX_LineSave_t;
|
} ASX_LineSave_t;
|
||||||
|
|
||||||
struct _ASX_Parser_t {
|
struct ASX_Parser_t {
|
||||||
int line; // Curent line
|
int line; // Curent line
|
||||||
ASX_LineSave_t *ret_stack;
|
ASX_LineSave_t *ret_stack;
|
||||||
int ret_stack_size;
|
int ret_stack_size;
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#ifndef GENERIC_MATH_H
|
#ifndef GENERIC_MATH_H
|
||||||
#define GENERIC_MATH_H
|
#define GENERIC_MATH_H
|
||||||
|
|
||||||
typedef struct _gen_sincos
|
typedef struct gen_sincos
|
||||||
{
|
{
|
||||||
double x;
|
double x;
|
||||||
double sinx;
|
double sinx;
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#ifndef GUI_BITMAP_H
|
#ifndef GUI_BITMAP_H
|
||||||
#define GUI_BITMAP_H
|
#define GUI_BITMAP_H
|
||||||
|
|
||||||
typedef struct _txSample
|
typedef struct txSample
|
||||||
{
|
{
|
||||||
unsigned long Width;
|
unsigned long Width;
|
||||||
unsigned long Height;
|
unsigned long Height;
|
||||||
|
|
|
@ -153,17 +153,17 @@ extern void guiLoadFont( void );
|
||||||
extern void guiLoadSubtitle( char * name );
|
extern void guiLoadSubtitle( char * name );
|
||||||
extern void guiMessageBox(int level, char * str);
|
extern void guiMessageBox(int level, char * str);
|
||||||
|
|
||||||
typedef struct _plItem
|
typedef struct plItem
|
||||||
{
|
{
|
||||||
struct _plItem * prev,* next;
|
struct plItem * prev,* next;
|
||||||
int played;
|
int played;
|
||||||
char * path;
|
char * path;
|
||||||
char * name;
|
char * name;
|
||||||
} plItem;
|
} plItem;
|
||||||
|
|
||||||
typedef struct _urlItem
|
typedef struct urlItem
|
||||||
{
|
{
|
||||||
struct _urlItem *next;
|
struct urlItem *next;
|
||||||
char * url;
|
char * url;
|
||||||
} URLItem;
|
} URLItem;
|
||||||
|
|
||||||
|
|
|
@ -48,7 +48,7 @@
|
||||||
|
|
||||||
#include <x264.h>
|
#include <x264.h>
|
||||||
|
|
||||||
typedef struct _h264_module_t {
|
typedef struct h264_module_t {
|
||||||
muxer_stream_t *mux;
|
muxer_stream_t *mux;
|
||||||
x264_t * x264;
|
x264_t * x264;
|
||||||
x264_picture_t pic;
|
x264_picture_t pic;
|
||||||
|
|
|
@ -319,7 +319,7 @@ m_option_t xvidencopts_conf[] =
|
||||||
* Module private data
|
* Module private data
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
typedef struct _xvid_mplayer_module_t
|
typedef struct xvid_mplayer_module_t
|
||||||
{
|
{
|
||||||
/* Instance related global vars */
|
/* Instance related global vars */
|
||||||
void *instance;
|
void *instance;
|
||||||
|
|
|
@ -120,19 +120,19 @@ typedef struct
|
||||||
} AVIINDEXENTRY;
|
} AVIINDEXENTRY;
|
||||||
|
|
||||||
|
|
||||||
typedef struct _avisuperindex_entry {
|
typedef struct avisuperindex_entry {
|
||||||
uint64_t qwOffset; // absolute file offset
|
uint64_t qwOffset; // absolute file offset
|
||||||
uint32_t dwSize; // size of index chunk at this offset
|
uint32_t dwSize; // size of index chunk at this offset
|
||||||
uint32_t dwDuration; // time span in stream ticks
|
uint32_t dwDuration; // time span in stream ticks
|
||||||
} avisuperindex_entry;
|
} avisuperindex_entry;
|
||||||
|
|
||||||
typedef struct _avistdindex_entry {
|
typedef struct avistdindex_entry {
|
||||||
uint32_t dwOffset; // qwBaseOffset + this is absolute file offset
|
uint32_t dwOffset; // qwBaseOffset + this is absolute file offset
|
||||||
uint32_t dwSize; // bit 31 is set if this is NOT a keyframe
|
uint32_t dwSize; // bit 31 is set if this is NOT a keyframe
|
||||||
} avistdindex_entry;
|
} avistdindex_entry;
|
||||||
|
|
||||||
// Standard index
|
// Standard index
|
||||||
typedef struct __attribute__((packed)) _avistdindex_chunk {
|
typedef struct __attribute__((packed)) avistdindex_chunk {
|
||||||
char fcc[4]; // ix##
|
char fcc[4]; // ix##
|
||||||
uint32_t dwSize; // size of this chunk
|
uint32_t dwSize; // size of this chunk
|
||||||
uint16_t wLongsPerEntry; // must be sizeof(aIndex[0])/sizeof(DWORD)
|
uint16_t wLongsPerEntry; // must be sizeof(aIndex[0])/sizeof(DWORD)
|
||||||
|
@ -147,7 +147,7 @@ typedef struct __attribute__((packed)) _avistdindex_chunk {
|
||||||
|
|
||||||
|
|
||||||
// Base Index Form 'indx'
|
// Base Index Form 'indx'
|
||||||
typedef struct _avisuperindex_chunk {
|
typedef struct avisuperindex_chunk {
|
||||||
char fcc[4];
|
char fcc[4];
|
||||||
uint32_t dwSize; // size of this chunk
|
uint32_t dwSize; // size of this chunk
|
||||||
uint16_t wLongsPerEntry; // size of each entry in aIndex array (must be 4*4 for us)
|
uint16_t wLongsPerEntry; // size of each entry in aIndex array (must be 4*4 for us)
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
#define CHUNK_FDSC mmioFOURCC('F', 'D', 'S', 'C')
|
#define CHUNK_FDSC mmioFOURCC('F', 'D', 'S', 'C')
|
||||||
#define CHUNK_STAB mmioFOURCC('S', 'T', 'A', 'B')
|
#define CHUNK_STAB mmioFOURCC('S', 'T', 'A', 'B')
|
||||||
|
|
||||||
typedef struct _film_chunk_t
|
typedef struct film_chunk_t
|
||||||
{
|
{
|
||||||
off_t chunk_offset;
|
off_t chunk_offset;
|
||||||
int chunk_size;
|
int chunk_size;
|
||||||
|
@ -37,7 +37,7 @@ typedef struct _film_chunk_t
|
||||||
float pts;
|
float pts;
|
||||||
} film_chunk_t;
|
} film_chunk_t;
|
||||||
|
|
||||||
typedef struct _film_data_t
|
typedef struct film_data_t
|
||||||
{
|
{
|
||||||
unsigned int total_chunks;
|
unsigned int total_chunks;
|
||||||
unsigned int current_chunk;
|
unsigned int current_chunk;
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
#include "demuxer.h"
|
#include "demuxer.h"
|
||||||
#include "stheader.h"
|
#include "stheader.h"
|
||||||
|
|
||||||
typedef struct __FrameInfo
|
typedef struct FrameInfo
|
||||||
{
|
{
|
||||||
ssize_t frameSize;
|
ssize_t frameSize;
|
||||||
ssize_t paddingSize;
|
ssize_t paddingSize;
|
||||||
|
|
|
@ -25,9 +25,9 @@ struct nuv_signature
|
||||||
char version[5]; /* "0.05" + \0 */
|
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;
|
off_t offset;
|
||||||
float time;
|
float time;
|
||||||
|
@ -35,7 +35,7 @@ struct _nuv_position_t
|
||||||
nuv_position_t* next;
|
nuv_position_t* next;
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef struct _nuv_info_t
|
typedef struct nuv_info_t
|
||||||
{
|
{
|
||||||
int current_audio_frame;
|
int current_audio_frame;
|
||||||
int current_video_frame;
|
int current_video_frame;
|
||||||
|
|
|
@ -133,7 +133,7 @@ typedef struct
|
||||||
}
|
}
|
||||||
GeneralPlugin;
|
GeneralPlugin;
|
||||||
|
|
||||||
typedef struct _VisPlugin
|
typedef struct VisPlugin
|
||||||
{
|
{
|
||||||
void *handle; /* Filled in by xmms */
|
void *handle; /* Filled in by xmms */
|
||||||
char *filename; /* 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 (*cleanup)(void); /* Called when the plugin is disabled */
|
||||||
void (*about)(void); /* Show the about box */
|
void (*about)(void); /* Show the about box */
|
||||||
void (*configure)(void); /* Show the configure 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_start)(void); /* Called when playback starts */
|
||||||
void (*playback_stop)(void); /* Called when playback stops */
|
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 */
|
void (*render_pcm)(short pcm_data[2][512]); /* Render the PCM data, don't do anything time consuming in here */
|
||||||
|
|
|
@ -55,7 +55,7 @@
|
||||||
* 'ratio' datatype, for rational numbers
|
* 'ratio' datatype, for rational numbers
|
||||||
* (see 'ratio' functions down below)
|
* (see 'ratio' functions down below)
|
||||||
************************************************************************/
|
************************************************************************/
|
||||||
typedef struct _y4m_ratio {
|
typedef struct y4m_ratio {
|
||||||
int n; /* numerator */
|
int n; /* numerator */
|
||||||
int d; /* denominator */
|
int d; /* denominator */
|
||||||
} y4m_ratio_t;
|
} 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_XTAGS 32 /* maximum number of xtags in list */
|
||||||
#define Y4M_MAX_XTAG_SIZE 32 /* max length of an xtag (including 'X') */
|
#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;
|
int count;
|
||||||
char *tags[Y4M_MAX_XTAGS];
|
char *tags[Y4M_MAX_XTAGS];
|
||||||
} y4m_xtag_list_t;
|
} y4m_xtag_list_t;
|
||||||
|
@ -114,7 +114,7 @@ typedef struct _y4m_xtag_list {
|
||||||
* Use the y4m_si_*() functions (see below).
|
* Use the y4m_si_*() functions (see below).
|
||||||
* You must initialize/finalize this structure before/after use.
|
* You must initialize/finalize this structure before/after use.
|
||||||
************************************************************************/
|
************************************************************************/
|
||||||
typedef struct _y4m_stream_info {
|
typedef struct y4m_stream_info {
|
||||||
/* values from header */
|
/* values from header */
|
||||||
int width;
|
int width;
|
||||||
int height;
|
int height;
|
||||||
|
@ -141,7 +141,7 @@ typedef struct _y4m_stream_info {
|
||||||
* Use the y4m_fi_*() functions (see below).
|
* Use the y4m_fi_*() functions (see below).
|
||||||
* You must initialize/finalize this structure before/after use.
|
* You must initialize/finalize this structure before/after use.
|
||||||
************************************************************************/
|
************************************************************************/
|
||||||
typedef struct _y4m_frame_info {
|
typedef struct y4m_frame_info {
|
||||||
/* mystical X tags */
|
/* mystical X tags */
|
||||||
y4m_xtag_list_t x_tags;
|
y4m_xtag_list_t x_tags;
|
||||||
} y4m_frame_info_t;
|
} y4m_frame_info_t;
|
||||||
|
|
|
@ -116,7 +116,7 @@ typedef enum tagPhysicalConnectorType { PhysConn_Video_Tuner = 1,
|
||||||
PhysConn_Audio_AudioDecoder = PhysConn_Audio_USB + 1
|
PhysConn_Audio_AudioDecoder = PhysConn_Audio_USB + 1
|
||||||
} PhysicalConnectorType;
|
} PhysicalConnectorType;
|
||||||
|
|
||||||
typedef struct _VIDEO_STREAM_CONFIG_CAPS {
|
typedef struct VIDEO_STREAM_CONFIG_CAPS {
|
||||||
GUID guid; // will be MEDIATYPE_Video
|
GUID guid; // will be MEDIATYPE_Video
|
||||||
ULONG VideoStandard; // logical OR of all AnalogVideoStandards
|
ULONG VideoStandard; // logical OR of all AnalogVideoStandards
|
||||||
// supported
|
// supported
|
||||||
|
@ -142,7 +142,7 @@ typedef struct _VIDEO_STREAM_CONFIG_CAPS {
|
||||||
LONG MaxBitsPerSecond;
|
LONG MaxBitsPerSecond;
|
||||||
} VIDEO_STREAM_CONFIG_CAPS, *PVIDEO_STREAM_CONFIG_CAPS;
|
} VIDEO_STREAM_CONFIG_CAPS, *PVIDEO_STREAM_CONFIG_CAPS;
|
||||||
|
|
||||||
typedef struct _AUDIO_STREAM_CONFIG_CAPS {
|
typedef struct AUDIO_STREAM_CONFIG_CAPS {
|
||||||
GUID guid;
|
GUID guid;
|
||||||
ULONG MinimumChannels;
|
ULONG MinimumChannels;
|
||||||
ULONG MaximumChannels;
|
ULONG MaximumChannels;
|
||||||
|
@ -238,12 +238,12 @@ typedef enum tagTVAudioMode {
|
||||||
AMTVAUDIO_MODE_LANG_C = 0x0040,
|
AMTVAUDIO_MODE_LANG_C = 0x0040,
|
||||||
} TVAudioMode;
|
} TVAudioMode;
|
||||||
|
|
||||||
typedef struct _FilterInfo {
|
typedef struct FilterInfo {
|
||||||
WCHAR achName[128];
|
WCHAR achName[128];
|
||||||
LPFILTERGRAPH pGraph;
|
LPFILTERGRAPH pGraph;
|
||||||
} FILTER_INFO;
|
} FILTER_INFO;
|
||||||
|
|
||||||
typedef struct _PinInfo {
|
typedef struct PinInfo {
|
||||||
LPBASEFILTER pFilter;
|
LPBASEFILTER pFilter;
|
||||||
PIN_DIRECTION dir;
|
PIN_DIRECTION dir;
|
||||||
unsigned short achName[128];
|
unsigned short achName[128];
|
||||||
|
|
|
@ -1781,7 +1781,7 @@ static int whiteonly(char *s)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
typedef struct _subfn
|
typedef struct subfn
|
||||||
{
|
{
|
||||||
int priority;
|
int priority;
|
||||||
char *fname;
|
char *fname;
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
to request services from the MAPDEV VxD.
|
to request services from the MAPDEV VxD.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
typedef struct _MapDevRequest
|
typedef struct MapDevRequest
|
||||||
{
|
{
|
||||||
DWORD mdr_ServiceID; /* supplied by caller */
|
DWORD mdr_ServiceID; /* supplied by caller */
|
||||||
LPVOID mdr_PhysicalAddress; /* supplied by caller */
|
LPVOID mdr_PhysicalAddress; /* supplied by caller */
|
||||||
|
|
|
@ -58,7 +58,7 @@ typedef vbr_finish_function *vbr_finish_function_ptr;
|
||||||
* The VBR CONTROLER structure - the spin of the library
|
* The VBR CONTROLER structure - the spin of the library
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
||||||
typedef struct _vbr_control_t
|
typedef struct vbr_control_t
|
||||||
{
|
{
|
||||||
|
|
||||||
/* All modes - specifies what VBR algorithm has to be used */
|
/* All modes - specifies what VBR algorithm has to be used */
|
||||||
|
|
Loading…
Reference in New Issue