diff options
| author | Mike Melanson <mike@multimedia.cx> | 2008-12-14 03:29:33 +0000 |
|---|---|---|
| committer | Mike Melanson <mike@multimedia.cx> | 2008-12-14 03:29:33 +0000 |
| commit | 02fb2546e85c8a9aaa1a595439d7b1cfbe2fcb0d (patch) | |
| tree | 291c85089fe534b6509de335fa66dfeb7dda1cf7 /libavformat | |
| parent | 5e6604490abfc03a1209698111a1dace1e970062 (diff) | |
| download | ffmpeg-02fb2546e85c8a9aaa1a595439d7b1cfbe2fcb0d.tar.gz | |
The POSIX namespace shall be held sacrosanct. To that end,
continue eliminating _t from structure names in FFmpeg.
Originally committed as revision 16118 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/segafilm.c | 10 | ||||
| -rw-r--r-- | libavformat/sierravmd.c | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/libavformat/segafilm.c b/libavformat/segafilm.c index 27ff06bc28..1ec8c28685 100644 --- a/libavformat/segafilm.c +++ b/libavformat/segafilm.c @@ -40,7 +40,7 @@ typedef struct { unsigned int sample_size; int64_t pts; int keyframe; -} film_sample_t; +} film_sample; typedef struct FilmDemuxContext { int video_stream_index; @@ -53,7 +53,7 @@ typedef struct FilmDemuxContext { enum CodecID video_type; unsigned int sample_count; - film_sample_t *sample_table; + film_sample *sample_table; unsigned int current_sample; unsigned int base_clock; @@ -163,9 +163,9 @@ static int film_read_header(AVFormatContext *s, return AVERROR_INVALIDDATA; film->base_clock = AV_RB32(&scratch[8]); film->sample_count = AV_RB32(&scratch[12]); - if(film->sample_count >= UINT_MAX / sizeof(film_sample_t)) + if(film->sample_count >= UINT_MAX / sizeof(film_sample)) return -1; - film->sample_table = av_malloc(film->sample_count * sizeof(film_sample_t)); + film->sample_table = av_malloc(film->sample_count * sizeof(film_sample)); for(i=0; i<s->nb_streams; i++) av_set_pts_info(s->streams[i], 33, 1, film->base_clock); @@ -205,7 +205,7 @@ static int film_read_packet(AVFormatContext *s, { FilmDemuxContext *film = s->priv_data; ByteIOContext *pb = s->pb; - film_sample_t *sample; + film_sample *sample; int ret = 0; int i; int left, right; diff --git a/libavformat/sierravmd.c b/libavformat/sierravmd.c index 0a5f2fa581..1bd00f2b51 100644 --- a/libavformat/sierravmd.c +++ b/libavformat/sierravmd.c @@ -39,7 +39,7 @@ typedef struct { int64_t pts; int keyframe; unsigned char frame_record[BYTES_PER_FRAME_RECORD]; -} vmd_frame_t; +} vmd_frame; typedef struct VmdDemuxContext { int video_stream_index; @@ -47,7 +47,7 @@ typedef struct VmdDemuxContext { unsigned int frame_count; unsigned int frames_per_block; - vmd_frame_t *frame_table; + vmd_frame *frame_table; unsigned int current_frame; int sample_rate; @@ -146,12 +146,12 @@ static int vmd_read_header(AVFormatContext *s, vmd->frame_table = NULL; sound_buffers = AV_RL16(&vmd->vmd_header[808]); raw_frame_table_size = vmd->frame_count * 6; - if(vmd->frame_count * vmd->frames_per_block >= UINT_MAX / sizeof(vmd_frame_t)){ + if(vmd->frame_count * vmd->frames_per_block >= UINT_MAX / sizeof(vmd_frame)){ av_log(s, AV_LOG_ERROR, "vmd->frame_count * vmd->frames_per_block too large\n"); return -1; } raw_frame_table = av_malloc(raw_frame_table_size); - vmd->frame_table = av_malloc((vmd->frame_count * vmd->frames_per_block + sound_buffers) * sizeof(vmd_frame_t)); + vmd->frame_table = av_malloc((vmd->frame_count * vmd->frames_per_block + sound_buffers) * sizeof(vmd_frame)); if (!raw_frame_table || !vmd->frame_table) { av_free(raw_frame_table); av_free(vmd->frame_table); @@ -248,7 +248,7 @@ static int vmd_read_packet(AVFormatContext *s, VmdDemuxContext *vmd = s->priv_data; ByteIOContext *pb = s->pb; int ret = 0; - vmd_frame_t *frame; + vmd_frame *frame; if (vmd->current_frame >= vmd->frame_count) return AVERROR(EIO); |