Mercurial > libavcodec.hg
changeset 7963:474794ff86df libavcodec
Merge declaration and assignment.
| author | benoit |
|---|---|
| date | Wed, 01 Oct 2008 08:27:37 +0000 |
| parents | c0745c5b1bb4 |
| children | cbf97db31e61 |
| files | indeo3.c |
| diffstat | 1 files changed, 9 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/indeo3.c Wed Oct 01 07:28:34 2008 +0000 +++ b/indeo3.c Wed Oct 01 08:27:37 2008 +0000 @@ -98,19 +98,15 @@ static av_cold int iv_alloc_frames(Indeo3DecodeContext *s) { - int luma_width, luma_height, luma_pixels, chroma_width, chroma_height, - chroma_pixels, i; - unsigned int bufsize; - - luma_width = (s->width + 3) & (~3); - luma_height = (s->height + 3) & (~3); - chroma_width = ((luma_width >> 2) + 3) & (~3); - chroma_height = ((luma_height>> 2) + 3) & (~3); - luma_pixels = luma_width * luma_height; - chroma_pixels = chroma_width * chroma_height; - - bufsize = luma_pixels * 2 + luma_width * 3 + - (chroma_pixels + chroma_width) * 4; + int luma_width = (s->width + 3) & ~3, + luma_height = (s->height + 3) & ~3, + chroma_width = ((luma_width >> 2) + 3) & ~3, + chroma_height = ((luma_height >> 2) + 3) & ~3, + luma_pixels = luma_width * luma_height, + chroma_pixels = chroma_width * chroma_height, + i; + unsigned int bufsize = luma_pixels * 2 + luma_width * 3 + + (chroma_pixels + chroma_width) * 4; if(!(s->buf = av_malloc(bufsize))) return AVERROR(ENOMEM);