[FFmpeg-cvslog] r17848 - trunk/libavcodec/pnm.c

[jbr]

Author: jbr
Date: Fri Mar  6 01:54:49 2009
New Revision: 17848

Log:
pnm: Add missing 'else'. Fixes decoding for 16-bit pgm.

Modified:
   trunk/libavcodec/pnm.c

Modified: trunk/libavcodec/pnm.c
==============================================================================
--- trunk/libavcodec/pnm.c	Fri Mar  6 01:48:02 2009	(r17847)
+++ trunk/libavcodec/pnm.c	Fri Mar  6 01:54:49 2009	(r17848)
@@ -138,7 +138,7 @@ int ff_pnm_decode_header(AVCodecContext 
                 avctx->pix_fmt = PIX_FMT_GRAY16BE;
                 if (s->maxval != 65535)
                     avctx->pix_fmt = PIX_FMT_GRAY16;
-            } if (avctx->pix_fmt == PIX_FMT_RGB24) {
+            } else if (avctx->pix_fmt == PIX_FMT_RGB24) {
                 if (s->maxval > 255)
                     avctx->pix_fmt = PIX_FMT_RGB48BE;
             } else {