← Back to branch summary

~medibuntu-maintainers/mplayer/medibuntu.precise

« back to all changes in this revision

Viewing changes to ffmpeg/libavcodec/iff.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/iff.c
368
368
}
369
369
 
370
370
AVCodec ff_iff_ilbm_decoder = {
371
 
    "iff_ilbm",
372
 
    AVMEDIA_TYPE_VIDEO,
373
 
    CODEC_ID_IFF_ILBM,
374
 
    sizeof(IffContext),
375
 
    decode_init,
376
 
    NULL,
377
 
    decode_end,
378
 
    decode_frame_ilbm,
379
 
    CODEC_CAP_DR1,
 
371
    .name           = "iff_ilbm",
 
372
    .type           = AVMEDIA_TYPE_VIDEO,
 
373
    .id             = CODEC_ID_IFF_ILBM,
 
374
    .priv_data_size = sizeof(IffContext),
 
375
    .init           = decode_init,
 
376
    .close          = decode_end,
 
377
    .decode         = decode_frame_ilbm,
 
378
    .capabilities   = CODEC_CAP_DR1,
380
379
    .long_name = NULL_IF_CONFIG_SMALL("IFF ILBM"),
381
380
};
382
381
 
383
382
AVCodec ff_iff_byterun1_decoder = {
384
 
    "iff_byterun1",
385
 
    AVMEDIA_TYPE_VIDEO,
386
 
    CODEC_ID_IFF_BYTERUN1,
387
 
    sizeof(IffContext),
388
 
    decode_init,
389
 
    NULL,
390
 
    decode_end,
391
 
    decode_frame_byterun1,
392
 
    CODEC_CAP_DR1,
 
383
    .name           = "iff_byterun1",
 
384
    .type           = AVMEDIA_TYPE_VIDEO,
 
385
    .id             = CODEC_ID_IFF_BYTERUN1,
 
386
    .priv_data_size = sizeof(IffContext),
 
387
    .init           = decode_init,
 
388
    .close          = decode_end,
 
389
    .decode         = decode_frame_byterun1,
 
390
    .capabilities   = CODEC_CAP_DR1,
393
391
    .long_name = NULL_IF_CONFIG_SMALL("IFF ByteRun1"),
394
392
};