/*
- * DVB subtitle decoding for ffmpeg
+ * DVB subtitle decoding
* Copyright (c) 2005 Ian Caulfield
*
* This file is part of Libav.
}
#endif
-#define RGBA(r,g,b,a) (((a) << 24) | ((r) << 16) | ((g) << 8) | (b))
+#define RGBA(r,g,b,a) (((unsigned)(a) << 24) | ((r) << 16) | ((g) << 8) | (b))
typedef struct DVBSubCLUT {
int id;
AVCodec ff_dvbsub_decoder = {
.name = "dvbsub",
.type = AVMEDIA_TYPE_SUBTITLE,
- .id = CODEC_ID_DVB_SUBTITLE,
+ .id = AV_CODEC_ID_DVB_SUBTITLE,
.priv_data_size = sizeof(DVBSubContext),
.init = dvbsub_init_decoder,
.close = dvbsub_close_decoder,
.decode = dvbsub_decode,
- .long_name = NULL_IF_CONFIG_SMALL("DVB subtitles"),
+ .long_name = NULL_IF_CONFIG_SMALL("DVB subtitles"),
};