summaryrefslogtreecommitdiff
path: root/libavcodec/pnm.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2011-12-28 05:54:59 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2011-12-28 05:54:59 +0100
commitc1bc1967f30e2e9ac0ffecbc4aadad873c1b586c (patch)
treeed3cbdba91455f7bf401e52a049dc448042d3681 /libavcodec/pnm.c
parent0e5fbbd7768a6eb42809c08a5dd46093caf407d3 (diff)
Fix a typo that broke writing (and reading) PAM files.
Reported and reviewed by Derek Buitenhuis.
Diffstat (limited to 'libavcodec/pnm.c')
-rw-r--r--libavcodec/pnm.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/pnm.c b/libavcodec/pnm.c
index dfc18d6013..09530f8131 100644
--- a/libavcodec/pnm.c
+++ b/libavcodec/pnm.c
@@ -93,7 +93,9 @@ int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * const s)
} else if (!strcmp(buf1, "MAXVAL")) {
pnm_get(s, buf1, sizeof(buf1));
maxval = strtol(buf1, NULL, 10);
- } else if (!strcmp(buf1, "TUPLETYPE")) {
+ } else if (!strcmp(buf1, "TUPLTYPE") ||
+ // FFmpeg used to write invalid files
+ !strcmp(buf1, "TUPLETYPE")) {
pnm_get(s, tuple_type, sizeof(tuple_type));
} else if (!strcmp(buf1, "ENDHDR")) {
break;