summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2012-01-17 00:38:54 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2012-01-17 00:42:17 +0100
commit00430075bd0f06e4c6d9612f3a522255155b035b (patch)
tree53980846b244c173f5ff49b03a5dccf7047f2ee3 /libavcodec
parent328e79329af80977451b501a2880f016ba0801e2 (diff)
Support 64bit pam decoding.
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/pnm.c3
-rw-r--r--libavcodec/pnmdec.c5
2 files changed, 6 insertions, 2 deletions
diff --git a/libavcodec/pnm.c b/libavcodec/pnm.c
index 1defbc20e6..212ec06c21 100644
--- a/libavcodec/pnm.c
+++ b/libavcodec/pnm.c
@@ -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;
diff --git a/libavcodec/pnmdec.c b/libavcodec/pnmdec.c
index ee15126889..4060c4e3b5 100644
--- a/libavcodec/pnmdec.c
+++ b/libavcodec/pnmdec.c
@@ -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;