ffmpeg roll of source to mar 9 version...

patched-ffmpeg-mt/libavformat/anm.c

 /*
  * Deluxe Paint Animation demuxer
  * Copyright (c) 2009 Peter Ross
  *
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
@@ skipping 21 matching lines @@
     unsigned int nb_records;
     int size;
 } Page;
 
 typedef struct {
     unsigned int nb_pages;    /** total pages in file */
     unsigned int nb_records;  /** total records in file */
     int page_table_offset;
 #define MAX_PAGES  256        /** Deluxe Paint hardcoded value */
     Page pt[MAX_PAGES];       /** page table */
-    int page;                 /** current page */
+    int page;                 /** current page (or AVERROR_xxx code) */
     int record;               /** current record (with in page) */
 } AnmDemuxContext;
 
 #define LPF_TAG  MKTAG('L','P','F',' ')
 #define ANIM_TAG MKTAG('A','N','I','M')
 
 static int probe(AVProbeData *p)
 {
     /* verify tags and video dimensions */
     if (AV_RL32(&p->buf[0])  == LPF_TAG &&
@@ skipping 125 matching lines @@
 {
     AnmDemuxContext *anm = s->priv_data;
     ByteIOContext *pb = s->pb;
     Page *p;
     int tmp, record_size;
 
     if (url_feof(s->pb))
         return AVERROR(EIO);
 
     if (anm->page < 0)
-        return 0;
+        return anm->page;
 
 repeat:
     p = &anm->pt[anm->page];
 
     /* parse page header */
     if (anm->record < 0) {
         url_fseek(pb, anm->page_table_offset + MAX_PAGES*6 + (anm->page<<16), SEEK_SET);
         url_fskip(pb, 8 + 2*p->nb_records);
         anm->record = 0;
     }
@@ skipping 27 matching lines @@
 }
 
 AVInputFormat anm_demuxer = {
     "anm",
     NULL_IF_CONFIG_SMALL("Deluxe Paint Animation"),
     sizeof(AnmDemuxContext),
     probe,
     read_header,
     read_packet,
 };