projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bc3057f
)
pnm: Add missing 'else'. Fixes decoding for 16-bit pgm.
author
Justin Ruggles
<justin.ruggles@gmail.com>
Fri, 6 Mar 2009 00:54:49 +0000
(
00:54
+0000)
committer
Justin Ruggles
<justin.ruggles@gmail.com>
Fri, 6 Mar 2009 00:54:49 +0000
(
00:54
+0000)
Originally committed as revision 17848 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/pnm.c
patch
|
blob
|
history
diff --git
a/libavcodec/pnm.c
b/libavcodec/pnm.c
index
4843d14
..
134e9f6
100644
(file)
--- 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 {