Mercurial > libavcodec.hg
comparison indeo3.c @ 7956:eb16a37644a5 libavcodec
Remove useless lines.
author | benoit |
---|---|
date | Tue, 30 Sep 2008 14:41:11 +0000 |
parents | ade9fe6072ea |
children | fbe8fabdbc63 |
comparison
equal
deleted
inserted
replaced
7955:ade9fe6072ea | 7956:eb16a37644a5 |
---|---|
99 static void iv_Decode_Chunk(Indeo3DecodeContext *s, uint8_t *cur, | 99 static void iv_Decode_Chunk(Indeo3DecodeContext *s, uint8_t *cur, |
100 uint8_t *ref, int width, int height, const uint8_t *buf1, | 100 uint8_t *ref, int width, int height, const uint8_t *buf1, |
101 long fflags2, const uint8_t *hdr, | 101 long fflags2, const uint8_t *hdr, |
102 const uint8_t *buf2, int min_width_160); | 102 const uint8_t *buf2, int min_width_160); |
103 | 103 |
104 /* ---------------------------------------------------------------------- */ | |
105 static av_cold int iv_alloc_frames(Indeo3DecodeContext *s) | 104 static av_cold int iv_alloc_frames(Indeo3DecodeContext *s) |
106 { | 105 { |
107 int luma_width, luma_height, luma_pixels, chroma_width, chroma_height, | 106 int luma_width, luma_height, luma_pixels, chroma_width, chroma_height, |
108 chroma_pixels, i; | 107 chroma_pixels, i; |
109 unsigned int bufsize; | 108 unsigned int bufsize; |
150 } | 149 } |
151 | 150 |
152 return 0; | 151 return 0; |
153 } | 152 } |
154 | 153 |
155 /* ---------------------------------------------------------------------- */ | |
156 static av_cold void iv_free_func(Indeo3DecodeContext *s) | 154 static av_cold void iv_free_func(Indeo3DecodeContext *s) |
157 { | 155 { |
158 av_free(s->buf); | 156 av_free(s->buf); |
159 av_free(s->ModPred); | 157 av_free(s->ModPred); |
160 av_free(s->corrector_type); | 158 av_free(s->corrector_type); |
161 } | 159 } |
162 | 160 |
163 /* ---------------------------------------------------------------------- */ | |
164 static unsigned long iv_decode_frame(Indeo3DecodeContext *s, | 161 static unsigned long iv_decode_frame(Indeo3DecodeContext *s, |
165 const uint8_t *buf, int buf_size) | 162 const uint8_t *buf, int buf_size) |
166 { | 163 { |
167 unsigned int hdr_width, hdr_height, | 164 unsigned int hdr_width, hdr_height, |
168 chroma_width, chroma_height; | 165 chroma_width, chroma_height; |
236 long split_flag; | 233 long split_flag; |
237 long split_direction; | 234 long split_direction; |
238 long usl7; | 235 long usl7; |
239 } ustr_t; | 236 } ustr_t; |
240 | 237 |
241 /* ---------------------------------------------------------------------- */ | |
242 | 238 |
243 #define LV1_CHECK(buf1,rle_v3,lv1,lp2) \ | 239 #define LV1_CHECK(buf1,rle_v3,lv1,lp2) \ |
244 if((lv1 & 0x80) != 0) { \ | 240 if((lv1 & 0x80) != 0) { \ |
245 if(rle_v3 != 0) \ | 241 if(rle_v3 != 0) \ |
246 rle_v3 = 0; \ | 242 rle_v3 = 0; \ |