diff avs.c @ 4081:3d6e7901bf05 libavformat

avoid POSIX reserved _t suffix
author aurel
date Thu, 11 Dec 2008 22:34:14 +0000
parents 1d3d17de20ba
children 536e5527c1e0
line wrap: on
line diff
--- a/avs.c	Thu Dec 11 22:24:56 2008 +0000
+++ b/avs.c	Thu Dec 11 22:34:14 2008 +0000
@@ -24,7 +24,7 @@
 
 
 typedef struct avs_format {
-    voc_dec_context_t voc;
+    VocDecContext voc;
     AVStream *st_video;
     AVStream *st_audio;
     int width;
@@ -34,7 +34,7 @@
     int nb_frames;
     int remaining_frame_size;
     int remaining_audio_size;
-} avs_format_t;
+} AvsFormat;
 
 typedef enum avs_block_type {
     AVS_NONE      = 0x00,
@@ -42,7 +42,7 @@
     AVS_AUDIO     = 0x02,
     AVS_PALETTE   = 0x03,
     AVS_GAME_DATA = 0x04,
-} avs_block_type_t;
+} AvsBlockType;
 
 static int avs_probe(AVProbeData * p)
 {
@@ -57,7 +57,7 @@
 
 static int avs_read_header(AVFormatContext * s, AVFormatParameters * ap)
 {
-    avs_format_t *avs = s->priv_data;
+    AvsFormat *avs = s->priv_data;
 
     s->ctx_flags |= AVFMTCTX_NOHEADER;
 
@@ -82,10 +82,10 @@
 
 static int
 avs_read_video_packet(AVFormatContext * s, AVPacket * pkt,
-                      avs_block_type_t type, int sub_type, int size,
+                      AvsBlockType type, int sub_type, int size,
                       uint8_t * palette, int palette_size)
 {
-    avs_format_t *avs = s->priv_data;
+    AvsFormat *avs = s->priv_data;
     int ret;
 
     ret = av_new_packet(pkt, size + palette_size);
@@ -120,7 +120,7 @@
 
 static int avs_read_audio_packet(AVFormatContext * s, AVPacket * pkt)
 {
-    avs_format_t *avs = s->priv_data;
+    AvsFormat *avs = s->priv_data;
     int ret, size;
 
     size = url_ftell(s->pb);
@@ -141,9 +141,9 @@
 
 static int avs_read_packet(AVFormatContext * s, AVPacket * pkt)
 {
-    avs_format_t *avs = s->priv_data;
+    AvsFormat *avs = s->priv_data;
     int sub_type = 0, size = 0;
-    avs_block_type_t type = AVS_NONE;
+    AvsBlockType type = AVS_NONE;
     int palette_size = 0;
     uint8_t palette[4 + 3 * 256];
     int ret;
@@ -218,7 +218,7 @@
 AVInputFormat avs_demuxer = {
     "avs",
     NULL_IF_CONFIG_SMALL("AVS format"),
-    sizeof(avs_format_t),
+    sizeof(AvsFormat),
     avs_probe,
     avs_read_header,
     avs_read_packet,