[SCM] libav/experimental: cosmetics: fix indentation after r15321
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:30:11 UTC 2013
The following commit has been merged in the experimental branch:
commit 8fd64adf0816669d5ba0ebdd198893c3b729614d
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date: Sun Sep 14 22:27:47 2008 +0000
cosmetics: fix indentation after r15321
Originally committed as revision 15332 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/pnm.c b/libavcodec/pnm.c
index be831dd..a3b4919 100644
--- a/libavcodec/pnm.c
+++ b/libavcodec/pnm.c
@@ -135,9 +135,9 @@ int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * const s){
s->maxval = atoi(buf1);
if (s->maxval >= 256) {
if (avctx->pix_fmt == PIX_FMT_GRAY8) {
- avctx->pix_fmt = PIX_FMT_GRAY16BE;
- if (s->maxval != 65535)
- avctx->pix_fmt = PIX_FMT_GRAY16;
+ avctx->pix_fmt = PIX_FMT_GRAY16BE;
+ if (s->maxval != 65535)
+ avctx->pix_fmt = PIX_FMT_GRAY16;
} else {
av_log(avctx, AV_LOG_ERROR, "16-bit components are only supported for grayscale\n");
avctx->pix_fmt = PIX_FMT_NONE;
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list