← Back to branch summary

~ubuntu-branches/ubuntu/trusty/gst-libav1.0/trusty-proposed

« back to all changes in this revision

Viewing changes to gst-libs/ext/libav/libavcodec/dvbsubdec.c

  • Committer: Package Import Robot
  • Author(s): Sebastian Dröge
  • Date: 2013-09-24 17:07:00 UTC
  • mfrom: (1.1.17) (7.1.9 experimental)
  • Revision ID: package-import@ubuntu.com-20130924170700-4dg62s3pwl0pdakz
Tags: 1.2.0-1
* New upstream stable release:
  + debian/control:
    - Build depend on GStreamer and gst-plugins-base >= 1.2.0.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gst-libs/ext/libav/libavcodec/dvbsubdec.c
150
150
}
151
151
#endif
152
152
 
153
 
#define RGBA(r,g,b,a) (((a) << 24) | ((r) << 16) | ((g) << 8) | (b))
 
153
#define RGBA(r,g,b,a) (((unsigned)(a) << 24) | ((r) << 16) | ((g) << 8) | (b))
154
154
 
155
155
typedef struct DVBSubCLUT {
156
156
    int id;
1466
1466
AVCodec ff_dvbsub_decoder = {
1467
1467
    .name           = "dvbsub",
1468
1468
    .type           = AVMEDIA_TYPE_SUBTITLE,
1469
 
    .id             = CODEC_ID_DVB_SUBTITLE,
 
1469
    .id             = AV_CODEC_ID_DVB_SUBTITLE,
1470
1470
    .priv_data_size = sizeof(DVBSubContext),
1471
1471
    .init           = dvbsub_init_decoder,
1472
1472
    .close          = dvbsub_close_decoder,
1473
1473
    .decode         = dvbsub_decode,
1474
 
    .long_name = NULL_IF_CONFIG_SMALL("DVB subtitles"),
 
1474
    .long_name      = NULL_IF_CONFIG_SMALL("DVB subtitles"),
1475
1475
};