diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2009-03-06 00:54:49 +0000 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2009-03-06 00:54:49 +0000 |
| commit | 5a92cc663c48a4229dd0d6701c1364720a30e44c (patch) | |
| tree | 42dfd4abff8bf559ca3be72c567aaa6da1ef35ba /libavcodec/pnm.c | |
| parent | bc3057f499a00000f18705bc1fa8719ed7d9daed (diff) | |
| download | ffmpeg-5a92cc663c48a4229dd0d6701c1364720a30e44c.tar.gz | |
pnm: Add missing 'else'. Fixes decoding for 16-bit pgm.
Originally committed as revision 17848 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/pnm.c')
| -rw-r--r-- | libavcodec/pnm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/pnm.c b/libavcodec/pnm.c index 4843d14653..134e9f6065 100644 --- a/libavcodec/pnm.c +++ b/libavcodec/pnm.c @@ -138,7 +138,7 @@ int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * const s){ 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 { |