Mercurial > libavcodec.hg

comparison pnm.c @ 7865:c7420b070961 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cosmetics: fix indentation after r15321
author jbr
date Sun, 14 Sep 2008 22:27:47 +0000
parents 48d00b406a26
children 04423b2f6e0b
comparison
equal deleted inserted replaced
7864:4820bd751284 7865:c7420b070961
133 if (avctx->pix_fmt != PIX_FMT_MONOWHITE) { 133 if (avctx->pix_fmt != PIX_FMT_MONOWHITE) {
134 pnm_get(s, buf1, sizeof(buf1)); 134 pnm_get(s, buf1, sizeof(buf1));
135 s->maxval = atoi(buf1); 135 s->maxval = atoi(buf1);
136 if (s->maxval >= 256) { 136 if (s->maxval >= 256) {
137 if (avctx->pix_fmt == PIX_FMT_GRAY8) { 137 if (avctx->pix_fmt == PIX_FMT_GRAY8) {
138 avctx->pix_fmt = PIX_FMT_GRAY16BE; 138 avctx->pix_fmt = PIX_FMT_GRAY16BE;
139 if (s->maxval != 65535) 139 if (s->maxval != 65535)
140 avctx->pix_fmt = PIX_FMT_GRAY16; 140 avctx->pix_fmt = PIX_FMT_GRAY16;
141 } else { 141 } else {
142 av_log(avctx, AV_LOG_ERROR, "16-bit components are only supported for grayscale\n"); 142 av_log(avctx, AV_LOG_ERROR, "16-bit components are only supported for grayscale\n");
143 avctx->pix_fmt = PIX_FMT_NONE; 143 avctx->pix_fmt = PIX_FMT_NONE;
144 return -1; 144 return -1;
145 } 145 }