← Back to branch summary

~medibuntu-maintainers/mplayer/medibuntu.precise

« back to all changes in this revision

Viewing changes to ffmpeg/libavcodec/anm.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2012-01-12 22:23:28 UTC
  • mfrom: (0.4.7 sid)
  • mto: This revision was merged to the branch mainline in revision 76.
  • Revision ID: package-import@ubuntu.com-20120112222328-8jqdyodym3p84ygu
Tags: 2:1.0~rc4.dfsg1+svn34540-1
* New upstream snapshot
* upload to unstable

Show diffs side-by-side

added added

removed removed

Lines of Context:
ffmpeg/libavcodec/anm.c
81
81
        int striplen = FFMIN(count, remaining);
82
82
        if (buf) {
83
83
            striplen = FFMIN(striplen, buf_end - *buf);
 
84
            if (*buf >= buf_end)
 
85
                goto exhausted;
84
86
            memcpy(*dst, *buf, striplen);
85
87
            *buf += striplen;
86
88
        } else if (pixel >= 0)
184
186
}
185
187
 
186
188
AVCodec ff_anm_decoder = {
187
 
    "anm",
188
 
    AVMEDIA_TYPE_VIDEO,
189
 
    CODEC_ID_ANM,
190
 
    sizeof(AnmContext),
191
 
    decode_init,
192
 
    NULL,
193
 
    decode_end,
194
 
    decode_frame,
195
 
    CODEC_CAP_DR1,
 
189
    .name           = "anm",
 
190
    .type           = AVMEDIA_TYPE_VIDEO,
 
191
    .id             = CODEC_ID_ANM,
 
192
    .priv_data_size = sizeof(AnmContext),
 
193
    .init           = decode_init,
 
194
    .close          = decode_end,
 
195
    .decode         = decode_frame,
 
196
    .capabilities   = CODEC_CAP_DR1,
196
197
    .long_name = NULL_IF_CONFIG_SMALL("Deluxe Paint Animation"),
197
198
};