Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger authored on 2012/01/29 22:21:36... | ... |
@@ -199,29 +199,29 @@ static int decode_frame(AVCodecContext *avctx, |
199 | 199 |
return -1; |
200 | 200 |
} |
201 | 201 |
|
202 |
- buf32=(const uint32_t*)buf; |
|
203 |
- for(y=0; y<avctx->height/2; y++){ |
|
204 |
- luma1=(uint32_t*)&f->data[0][ y*2*f->linesize[0] ]; |
|
205 |
- luma2=(uint32_t*)&f->data[0][ (y*2+1)*f->linesize[0] ]; |
|
206 |
- cr=(uint32_t*)&f->data[1][ y*f->linesize[1] ]; |
|
207 |
- cb=(uint32_t*)&f->data[2][ y*f->linesize[2] ]; |
|
208 |
- for(x=0; x<avctx->width; x+=8){ |
|
209 |
- *luma1++ = *buf32++; |
|
210 |
- *luma1++ = *buf32++; |
|
211 |
- *luma2++ = *buf32++; |
|
212 |
- *luma2++ = *buf32++; |
|
213 |
- *cr++ = *buf32++; |
|
214 |
- *cb++ = *buf32++; |
|
215 |
- } |
|
202 |
+ buf32=(const uint32_t*)buf; |
|
203 |
+ for(y=0; y<avctx->height/2; y++){ |
|
204 |
+ luma1=(uint32_t*)&f->data[0][ y*2*f->linesize[0] ]; |
|
205 |
+ luma2=(uint32_t*)&f->data[0][ (y*2+1)*f->linesize[0] ]; |
|
206 |
+ cr=(uint32_t*)&f->data[1][ y*f->linesize[1] ]; |
|
207 |
+ cb=(uint32_t*)&f->data[2][ y*f->linesize[2] ]; |
|
208 |
+ for(x=0; x<avctx->width; x+=8){ |
|
209 |
+ *luma1++ = *buf32++; |
|
210 |
+ *luma1++ = *buf32++; |
|
211 |
+ *luma2++ = *buf32++; |
|
212 |
+ *luma2++ = *buf32++; |
|
213 |
+ *cr++ = *buf32++; |
|
214 |
+ *cb++ = *buf32++; |
|
216 | 215 |
} |
216 |
+ } |
|
217 | 217 |
break; |
218 | 218 |
|
219 | 219 |
case 1: |
220 | 220 |
/* Fraps v1 is an upside-down BGR24 */ |
221 |
- for(y=0; y<avctx->height; y++) |
|
222 |
- memcpy(&f->data[0][ (avctx->height-y)*f->linesize[0] ], |
|
223 |
- &buf[y*avctx->width*3], |
|
224 |
- 3*avctx->width); |
|
221 |
+ for(y=0; y<avctx->height; y++) |
|
222 |
+ memcpy(&f->data[0][ (avctx->height-y)*f->linesize[0] ], |
|
223 |
+ &buf[y*avctx->width*3], |
|
224 |
+ 3*avctx->width); |
|
225 | 225 |
break; |
226 | 226 |
|
227 | 227 |
case 2: |