virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

Fix indentation after r18047.

Browse Source 
Originally committed as revision 18048 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger 2009-03-19 21:36:59 +00:00
parent c9d6e84778
commit 45bae968a9
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/utils.c
View File

@ -258,24 +258,24 @@ int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic){
do { do {
// NOTE: do not align linesizes individually, this breaks e.g. assumptions // NOTE: do not align linesizes individually, this breaks e.g. assumptions
// that linesize[0] == 2*linesize[1] in the MPEG-encoder for 4:2:2 // that linesize[0] == 2*linesize[1] in the MPEG-encoder for 4:2:2
ff_fill_linesize(&picture, s->pix_fmt, w); ff_fill_linesize(&picture, s->pix_fmt, w);
// increase alignment of w for next try (rhs gives the lowest bit set in w) // increase alignment of w for next try (rhs gives the lowest bit set in w)
w += w & ~(w-1); w += w & ~(w-1);
unaligned = 0; unaligned = 0;
for (i=0; i<4; i++){ for (i=0; i<4; i++){
//STRIDE_ALIGN is 8 for SSE* but this does not work for SVQ1 chroma planes //STRIDE_ALIGN is 8 for SSE* but this does not work for SVQ1 chroma planes
//we could change STRIDE_ALIGN to 16 for x86/sse but it would increase the //we could change STRIDE_ALIGN to 16 for x86/sse but it would increase the
//picture size unneccessarily in some cases. The solution here is not //picture size unneccessarily in some cases. The solution here is not
//pretty and better ideas are welcome! //pretty and better ideas are welcome!
#if HAVE_MMX #if HAVE_MMX
if(s->codec_id == CODEC_ID_SVQ1) if(s->codec_id == CODEC_ID_SVQ1)
stride_align[i]= 16; stride_align[i]= 16;
else else
#endif #endif
stride_align[i] = STRIDE_ALIGN; stride_align[i] = STRIDE_ALIGN;
unaligned |= picture.linesize[i] % stride_align[i]; unaligned |= picture.linesize[i] % stride_align[i];
} }
} while (unaligned); } while (unaligned);
tmpsize = ff_fill_pointer(&picture, NULL, s->pix_fmt, h); tmpsize = ff_fill_pointer(&picture, NULL, s->pix_fmt, h);