summaryrefslogtreecommitdiff
path: root/libavcodec/pnmdec.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2015-01-22 01:49:04 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2015-01-22 01:49:04 +0100
commit6c559a0a9d3e8eb10e2b92b6793e11038ab86fcf (patch)
tree02da8b08d7cac832f1d8f9194ea3e1fb6bee47f3 /libavcodec/pnmdec.c
parent196dd72bcfe073a77be5fd55a69de61d54a3a2dc (diff)
lavc/pnm: Support decoding ya16.
Diffstat (limited to 'libavcodec/pnmdec.c')
-rw-r--r--libavcodec/pnmdec.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/libavcodec/pnmdec.c b/libavcodec/pnmdec.c
index c84b6eb080..e634500674 100644
--- a/libavcodec/pnmdec.c
+++ b/libavcodec/pnmdec.c
@@ -108,6 +108,13 @@ static int pnm_decode_frame(AVCodecContext *avctx, void *data,
if (s->maxval < 65535)
upgrade = 2;
goto do_read;
+ case AV_PIX_FMT_YA16:
+ n = avctx->width * 4;
+ components=2;
+ sample_len=16;
+ if (s->maxval < 65535)
+ upgrade = 2;
+ goto do_read;
case AV_PIX_FMT_MONOWHITE:
case AV_PIX_FMT_MONOBLACK:
n = (avctx->width + 7) >> 3;