RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Support 64bit pam decoding.

This commit is contained in:
Carl Eugen Hoyos 2012-01-17 00:38:54 +01:00
parent 328e79329a
commit 00430075bd
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
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
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;