summaryrefslogtreecommitdiff
path: root/libavcodec/svq1dec.c
diff options
context:
space:
mode:
authorMike Melanson <mike@multimedia.cx>2008-12-14 03:29:33 +0000
committerMike Melanson <mike@multimedia.cx>2008-12-14 03:29:33 +0000
commit02fb2546e85c8a9aaa1a595439d7b1cfbe2fcb0d (patch)
tree291c85089fe534b6509de335fa66dfeb7dda1cf7 /libavcodec/svq1dec.c
parent5e6604490abfc03a1209698111a1dace1e970062 (diff)
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 'libavcodec/svq1dec.c')
-rw-r--r--libavcodec/svq1dec.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c
index 8f399ab39d..d306149007 100644
--- a/libavcodec/svq1dec.c
+++ b/libavcodec/svq1dec.c
@@ -56,7 +56,7 @@ static VLC svq1_inter_mean;
typedef struct svq1_pmv_s {
int x;
int y;
-} svq1_pmv_t;
+} svq1_pmv;
static const uint16_t checksum_table[256] = {
0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50A5, 0x60C6, 0x70E7,
@@ -301,7 +301,7 @@ static int svq1_decode_block_non_intra (GetBitContext *bitbuf, uint8_t *pixels,
return 0;
}
-static int svq1_decode_motion_vector (GetBitContext *bitbuf, svq1_pmv_t *mv, svq1_pmv_t **pmv) {
+static int svq1_decode_motion_vector (GetBitContext *bitbuf, svq1_pmv *mv, svq1_pmv **pmv) {
int diff;
int i;
@@ -342,11 +342,11 @@ static void svq1_skip_block (uint8_t *current, uint8_t *previous, int pitch, int
static int svq1_motion_inter_block (MpegEncContext *s, GetBitContext *bitbuf,
uint8_t *current, uint8_t *previous, int pitch,
- svq1_pmv_t *motion, int x, int y) {
+ svq1_pmv *motion, int x, int y) {
uint8_t *src;
uint8_t *dst;
- svq1_pmv_t mv;
- svq1_pmv_t *pmv[3];
+ svq1_pmv mv;
+ svq1_pmv *pmv[3];
int result;
/* predict and decode motion vector */
@@ -394,11 +394,11 @@ static int svq1_motion_inter_block (MpegEncContext *s, GetBitContext *bitbuf,
static int svq1_motion_inter_4v_block (MpegEncContext *s, GetBitContext *bitbuf,
uint8_t *current, uint8_t *previous, int pitch,
- svq1_pmv_t *motion,int x, int y) {
+ svq1_pmv *motion,int x, int y) {
uint8_t *src;
uint8_t *dst;
- svq1_pmv_t mv;
- svq1_pmv_t *pmv[4];
+ svq1_pmv mv;
+ svq1_pmv *pmv[4];
int i, result;
/* predict and decode motion vector (0) */
@@ -484,7 +484,7 @@ static int svq1_motion_inter_4v_block (MpegEncContext *s, GetBitContext *bitbuf,
static int svq1_decode_delta_block (MpegEncContext *s, GetBitContext *bitbuf,
uint8_t *current, uint8_t *previous, int pitch,
- svq1_pmv_t *motion, int x, int y) {
+ svq1_pmv *motion, int x, int y) {
uint32_t block_type;
int result = 0;
@@ -727,9 +727,9 @@ static int svq1_decode_frame(AVCodecContext *avctx,
current += 16*linesize;
}
} else {
- svq1_pmv_t pmv[width/8+3];
+ svq1_pmv pmv[width/8+3];
/* delta frame */
- memset (pmv, 0, ((width / 8) + 3) * sizeof(svq1_pmv_t));
+ memset (pmv, 0, ((width / 8) + 3) * sizeof(svq1_pmv));
for (y=0; y < height; y+=16) {
for (x=0; x < width; x+=16) {