RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cosmetics: use one type per field in every structs 

Originally committed as revision 9220 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2007-06-04 22:35:16 +00:00
parent e39291dfcf
commit 8d75b5a2fb
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
libavformat/matroskadec.c
View File

@ -39,15 +39,15 @@ typedef struct Track {
/* Unique track number and track ID. stream_index is the index that /* Unique track number and track ID. stream_index is the index that
* the calling app uses for this track. */ * the calling app uses for this track. */
uint32_t num, uint32_t num;
uid, uint32_t uid;
stream_index; uint32_t stream_index;
char *name, char *name;
*language; char *language;
char *codec_id, char *codec_id;
*codec_name; char *codec_name;
unsigned char *codec_priv; unsigned char *codec_priv;
int codec_priv_size; int codec_priv_size;
@ -59,10 +59,10 @@ typedef struct Track {
typedef struct MatroskaVideoTrack { typedef struct MatroskaVideoTrack {
MatroskaTrack track; MatroskaTrack track;
int pixel_width, int pixel_width;
pixel_height, int pixel_height;
display_width, int display_width;
display_height; int display_height;
uint32_t fourcc; uint32_t fourcc;
@ -75,10 +75,10 @@ typedef struct MatroskaVideoTrack {
typedef struct MatroskaAudioTrack { typedef struct MatroskaAudioTrack {
MatroskaTrack track; MatroskaTrack track;
int channels, int channels;
bitdepth, int bitdepth;
internal_samplerate, int internal_samplerate;
samplerate; int samplerate;
int block_align; int block_align;
/* real audio header */ /* real audio header */
@ -103,7 +103,8 @@ typedef struct MatroskaSubtitleTrack {
sizeof(MatroskaSubtitleTrack))) sizeof(MatroskaSubtitleTrack)))
typedef struct MatroskaLevel { typedef struct MatroskaLevel {
uint64_t start, length; uint64_t start;
uint64_t length;
} MatroskaLevel; } MatroskaLevel;
typedef struct MatroskaDemuxIndex { typedef struct MatroskaDemuxIndex {
@ -121,8 +122,8 @@ typedef struct MatroskaDemuxContext {
int level_up; int level_up;
/* matroska stuff */ /* matroska stuff */
char *writing_app, char *writing_app;
*muxing_app; char *muxing_app;
int64_t created; int64_t created;
/* timescale in the file */ /* timescale in the file */
@ -130,7 +131,8 @@ typedef struct MatroskaDemuxContext {
/* num_streams is the number of streams that av_new_stream() was called /* num_streams is the number of streams that av_new_stream() was called
* for ( = that are available to the calling program). */ * for ( = that are available to the calling program). */
int num_tracks, num_streams; int num_tracks;
int num_streams;
MatroskaTrack *tracks[MAX_STREAMS]; MatroskaTrack *tracks[MAX_STREAMS];
/* cache for ID peeking */ /* cache for ID peeking */
@ -144,9 +146,9 @@ typedef struct MatroskaDemuxContext {
int num_packets; int num_packets;
/* have we already parse metadata/cues/clusters? */ /* have we already parse metadata/cues/clusters? */
int metadata_parsed, int metadata_parsed;
index_parsed, int index_parsed;
done; int done;
/* The index for seeking. */ /* The index for seeking. */
int num_indexes; int num_indexes;