From 3d52bca6bf5794676bf0e89b494124a43bb19309 Mon Sep 17 00:00:00 2001
From: Aurelien Jacobs <aurel@gnuage.org>
Date: Thu, 11 Dec 2008 22:56:19 +0000
Subject: avoid POSIX reserved _t suffix

Originally committed as revision 16068 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavcodec/vp5.c | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'libavcodec/vp5.c')

diff --git a/libavcodec/vp5.c b/libavcodec/vp5.c
index 4f9d42f446..61155b4789 100644
--- a/libavcodec/vp5.c
+++ b/libavcodec/vp5.c
@@ -33,10 +33,10 @@
 #include "vp5data.h"
 
 
-static int vp5_parse_header(vp56_context_t *s, const uint8_t *buf, int buf_size,
+static int vp5_parse_header(VP56Context *s, const uint8_t *buf, int buf_size,
                             int *golden_frame)
 {
-    vp56_range_coder_t *c = &s->c;
+    VP56RangeCoder *c = &s->c;
     int rows, cols;
 
     vp56_init_range_decoder(&s->c, buf, buf_size);
@@ -84,10 +84,10 @@ static int vp5_adjust(int v, int t)
     return v;
 }
 
-static void vp5_parse_vector_adjustment(vp56_context_t *s, vp56_mv_t *vect)
+static void vp5_parse_vector_adjustment(VP56Context *s, VP56mv *vect)
 {
-    vp56_range_coder_t *c = &s->c;
-    vp56_model_t *model = s->modelp;
+    VP56RangeCoder *c = &s->c;
+    Vp56Model *model = s->modelp;
     int comp, di;
 
     for (comp=0; comp<2; comp++) {
@@ -108,10 +108,10 @@ static void vp5_parse_vector_adjustment(vp56_context_t *s, vp56_mv_t *vect)
     }
 }
 
-static void vp5_parse_vector_models(vp56_context_t *s)
+static void vp5_parse_vector_models(VP56Context *s)
 {
-    vp56_range_coder_t *c = &s->c;
-    vp56_model_t *model = s->modelp;
+    VP56RangeCoder *c = &s->c;
+    Vp56Model *model = s->modelp;
     int comp, node;
 
     for (comp=0; comp<2; comp++) {
@@ -131,10 +131,10 @@ static void vp5_parse_vector_models(vp56_context_t *s)
                 model->vector_pdv[comp][node] = vp56_rac_gets_nn(c, 7);
 }
 
-static void vp5_parse_coeff_models(vp56_context_t *s)
+static void vp5_parse_coeff_models(VP56Context *s)
 {
-    vp56_range_coder_t *c = &s->c;
-    vp56_model_t *model = s->modelp;
+    VP56RangeCoder *c = &s->c;
+    Vp56Model *model = s->modelp;
     uint8_t def_prob[11];
     int node, cg, ctx;
     int ct;    /* code type */
@@ -177,10 +177,10 @@ static void vp5_parse_coeff_models(vp56_context_t *s)
                         model->coeff_acct[pt][ct][cg][ctx][node] = av_clip(((model->coeff_ract[pt][ct][cg][node] * vp5_ract_lc[ct][cg][node][ctx][0] + 128) >> 8) + vp5_ract_lc[ct][cg][node][ctx][1], 1, 254);
 }
 
-static void vp5_parse_coeff(vp56_context_t *s)
+static void vp5_parse_coeff(VP56Context *s)
 {
-    vp56_range_coder_t *c = &s->c;
-    vp56_model_t *model = s->modelp;
+    VP56RangeCoder *c = &s->c;
+    Vp56Model *model = s->modelp;
     uint8_t *permute = s->scantable.permutated;
     uint8_t *model1, *model2;
     int coeff, sign, coeff_idx;
@@ -250,9 +250,9 @@ static void vp5_parse_coeff(vp56_context_t *s)
     }
 }
 
-static void vp5_default_models_init(vp56_context_t *s)
+static void vp5_default_models_init(VP56Context *s)
 {
-    vp56_model_t *model = s->modelp;
+    Vp56Model *model = s->modelp;
     int i;
 
     for (i=0; i<2; i++) {
@@ -267,7 +267,7 @@ static void vp5_default_models_init(vp56_context_t *s)
 
 static av_cold int vp5_decode_init(AVCodecContext *avctx)
 {
-    vp56_context_t *s = avctx->priv_data;
+    VP56Context *s = avctx->priv_data;
 
     vp56_init(avctx, 1, 0);
     s->vp56_coord_div = vp5_coord_div;
@@ -286,7 +286,7 @@ AVCodec vp5_decoder = {
     "vp5",
     CODEC_TYPE_VIDEO,
     CODEC_ID_VP5,
-    sizeof(vp56_context_t),
+    sizeof(VP56Context),
     vp5_decode_init,
     NULL,
     vp56_free,
-- 
cgit v1.2.3