[FFmpeg-cvslog] Fix a typo that broke writing (and reading) PAM files.

[Carl Eugen Hoyos]

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Wed Dec 28 05:54:59 2011 +0100| [c1bc1967f30e2e9ac0ffecbc4aadad873c1b586c] | committer: Carl Eugen Hoyos

Fix a typo that broke writing (and reading) PAM files.

Reported and reviewed by Derek Buitenhuis.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c1bc1967f30e2e9ac0ffecbc4aadad873c1b586c
---

 libavcodec/pamenc.c |    2 +-
 libavcodec/pnm.c    |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavcodec/pamenc.c b/libavcodec/pamenc.c
index d9d849e..28fe7e1 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 dfc18d6..09530f8 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;