comparison utils.c @ 9193:9fd579338f23 libavcodec

Fix indentation after r18047.
author reimar
date Thu, 19 Mar 2009 21:36:59 +0000
parents 6faca73d75cc
children 6a1ad1d933cd
comparison
equal deleted inserted replaced
9192:6faca73d75cc 9193:9fd579338f23
256 } 256 }
257 257
258 do { 258 do {
259 // NOTE: do not align linesizes individually, this breaks e.g. assumptions 259 // NOTE: do not align linesizes individually, this breaks e.g. assumptions
260 // that linesize[0] == 2*linesize[1] in the MPEG-encoder for 4:2:2 260 // that linesize[0] == 2*linesize[1] in the MPEG-encoder for 4:2:2
261 ff_fill_linesize(&picture, s->pix_fmt, w); 261 ff_fill_linesize(&picture, s->pix_fmt, w);
262 // increase alignment of w for next try (rhs gives the lowest bit set in w) 262 // increase alignment of w for next try (rhs gives the lowest bit set in w)
263 w += w & ~(w-1); 263 w += w & ~(w-1);
264 264
265 unaligned = 0; 265 unaligned = 0;
266 for (i=0; i<4; i++){ 266 for (i=0; i<4; i++){
267 //STRIDE_ALIGN is 8 for SSE* but this does not work for SVQ1 chroma planes 267 //STRIDE_ALIGN is 8 for SSE* but this does not work for SVQ1 chroma planes
268 //we could change STRIDE_ALIGN to 16 for x86/sse but it would increase the 268 //we could change STRIDE_ALIGN to 16 for x86/sse but it would increase the
269 //picture size unneccessarily in some cases. The solution here is not 269 //picture size unneccessarily in some cases. The solution here is not
270 //pretty and better ideas are welcome! 270 //pretty and better ideas are welcome!
271 #if HAVE_MMX 271 #if HAVE_MMX
272 if(s->codec_id == CODEC_ID_SVQ1) 272 if(s->codec_id == CODEC_ID_SVQ1)
273 stride_align[i]= 16; 273 stride_align[i]= 16;
274 else 274 else
275 #endif 275 #endif
276 stride_align[i] = STRIDE_ALIGN; 276 stride_align[i] = STRIDE_ALIGN;
277 unaligned |= picture.linesize[i] % stride_align[i]; 277 unaligned |= picture.linesize[i] % stride_align[i];
278 } 278 }
279 } while (unaligned); 279 } while (unaligned);
280 280
281 tmpsize = ff_fill_pointer(&picture, NULL, s->pix_fmt, h); 281 tmpsize = ff_fill_pointer(&picture, NULL, s->pix_fmt, h);
282 if (tmpsize < 0) 282 if (tmpsize < 0)
283 return -1; 283 return -1;