← Back to branch summary

~noskcaj/ubuntu/saucy/libav/merge0.8.7-1

« back to all changes in this revision

Viewing changes to libavcodec/dvdsubdec.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2012-01-12 22:30:00 UTC
  • mfrom: (1.2.8) (1.1.13 experimental)
  • Revision ID: package-import@ubuntu.com-20120112223000-cmfo7w78q13i2fd9
Tags: 4:0.8~beta2-1ubuntu1
* Merge from debian, remaining changes:
  - don't build against libdirac, lame, libopenjpeg, librtmp, 
    x264, and xvid  (all in universe)

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/dvdsubdec.c
1
1
/*
2
 
 * DVD subtitle decoding for ffmpeg
 
2
 * DVD subtitle decoding
3
3
 * Copyright (c) 2005 Fabrice Bellard
4
4
 *
5
5
 * This file is part of Libav.
487
487
}
488
488
 
489
489
AVCodec ff_dvdsub_decoder = {
490
 
    "dvdsub",
491
 
    AVMEDIA_TYPE_SUBTITLE,
492
 
    CODEC_ID_DVD_SUBTITLE,
493
 
    0,
494
 
    NULL,
495
 
    NULL,
496
 
    NULL,
497
 
    dvdsub_decode,
 
490
    .name           = "dvdsub",
 
491
    .type           = AVMEDIA_TYPE_SUBTITLE,
 
492
    .id             = CODEC_ID_DVD_SUBTITLE,
 
493
    .decode         = dvdsub_decode,
498
494
    .long_name = NULL_IF_CONFIG_SMALL("DVD subtitles"),
499
495
};