Mercurial > libavformat.hg
diff sierravmd.c @ 4102:dcaeec7bd85f libavformat
The POSIX namespace shall be held sacrosanct. To that end,
continue eliminating _t from structure names in FFmpeg.
author | melanson |
---|---|
date | Sun, 14 Dec 2008 03:29:33 +0000 |
parents | 549a09cf23fe |
children | e9ef9239086b |
line wrap: on
line diff
--- a/sierravmd.c Sat Dec 13 23:25:19 2008 +0000 +++ b/sierravmd.c Sun Dec 14 03:29:33 2008 +0000 @@ -39,7 +39,7 @@ 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 @@ 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 @@ 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 @@ 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);