Browse Source

Support 64bit pam decoding.

tags/n0.10
Carl Eugen Hoyos 13 years ago
parent
commit
00430075bd
2 changed files with 6 additions and 2 deletions
  1. +1
    -2
      libavcodec/pnm.c
  2. +5
    -0
      libavcodec/pnmdec.c

+ 1
- 2
libavcodec/pnm.c View File

@@ -131,8 +131,7 @@ int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * const s)
if (maxval < 256) {
avctx->pix_fmt = PIX_FMT_RGB32;
} else {
av_log(avctx, AV_LOG_ERROR, "Unsupported bit depth\n");
return -1;
avctx->pix_fmt = PIX_FMT_RGBA64BE;
}
} else {
return -1;


+ 5
- 0
libavcodec/pnmdec.c View File

@@ -58,6 +58,11 @@ static int pnm_decode_frame(AVCodecContext *avctx, void *data,
switch (avctx->pix_fmt) {
default:
return -1;
case PIX_FMT_RGBA64BE:
n = avctx->width * 8;
components=4;
sample_len=16;
goto do_read;
case PIX_FMT_RGB48BE:
n = avctx->width * 6;
components=3;


Loading…
Cancel
Save