aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/pnmdec.c
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/pnmdec.c
parent328e79329af80977451b501a2880f016ba0801e2 (diff)
downloadandroid_external_ffmpeg-00430075bd0f06e4c6d9612f3a522255155b035b.tar.gz
android_external_ffmpeg-00430075bd0f06e4c6d9612f3a522255155b035b.tar.bz2
android_external_ffmpeg-00430075bd0f06e4c6d9612f3a522255155b035b.zip
Support 64bit pam decoding.
Diffstat (limited to 'libavcodec/pnmdec.c')
-rw-r--r--libavcodec/pnmdec.c5
1 files changed, 5 insertions, 0 deletions
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;