diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-12-28 05:54:59 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-12-28 05:54:59 +0100 |
| commit | c1bc1967f30e2e9ac0ffecbc4aadad873c1b586c (patch) | |
| tree | ed3cbdba91455f7bf401e52a049dc448042d3681 | |
| parent | 0e5fbbd7768a6eb42809c08a5dd46093caf407d3 (diff) | |
| download | ffmpeg-c1bc1967f30e2e9ac0ffecbc4aadad873c1b586c.tar.gz | |
Fix a typo that broke writing (and reading) PAM files.
Reported and reviewed by Derek Buitenhuis.
| -rw-r--r-- | libavcodec/pamenc.c | 2 | ||||
| -rw-r--r-- | libavcodec/pnm.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/pamenc.c b/libavcodec/pamenc.c index d9d849e8ad..28fe7e13d7 100644 --- a/libavcodec/pamenc.c +++ b/libavcodec/pamenc.c @@ -78,7 +78,7 @@ static int pam_encode_frame(AVCodecContext *avctx, unsigned char *outbuf, return -1; } snprintf(s->bytestream, s->bytestream_end - s->bytestream, - "P7\nWIDTH %d\nHEIGHT %d\nDEPTH %d\nMAXVAL %d\nTUPLETYPE %s\nENDHDR\n", + "P7\nWIDTH %d\nHEIGHT %d\nDEPTH %d\nMAXVAL %d\nTUPLTYPE %s\nENDHDR\n", w, h, depth, maxval, tuple_type); s->bytestream += strlen(s->bytestream); 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; |