* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#if !defined( __LIBVLC__ )
- #error You are not libvlc or one of its plugins. You cannot include this file
-#endif
-
#ifndef _VLC_CODECS_H
#define _VLC_CODECS_H 1
+#ifdef HAVE_ATTRIBUTE_PACKED
+# define ATTR_PACKED __attribute__((__packed__))
+#else
+# error FIXME
+#endif
+
/* Structures exported to the demuxers and decoders */
#if !(defined _GUID_DEFINED || defined GUID_DEFINED)
#ifndef _WAVEFORMATEX_
#define _WAVEFORMATEX_
typedef struct
-#ifdef HAVE_ATTRIBUTE_PACKED
- __attribute__((__packed__))
-#endif
+ATTR_PACKED
_WAVEFORMATEX {
uint16_t wFormatTag;
uint16_t nChannels;
#ifndef _WAVEFORMATEXTENSIBLE_
#define _WAVEFORMATEXTENSIBLE_
typedef struct
-#ifdef HAVE_ATTRIBUTE_PACKED
- __attribute__((__packed__))
-#endif
+ATTR_PACKED
_WAVEFORMATEXTENSIBLE {
WAVEFORMATEX Format;
union {
#ifndef _WAVEHEADER_
#define _WAVEHEADER_
typedef struct
-#ifdef HAVE_ATTRIBUTE_PACKED
- __attribute__((__packed__))
-#endif
+ATTR_PACKED
_WAVEHEADER {
uint32_t MainChunkID;
uint32_t Length;
#if !defined(_BITMAPINFOHEADER_) && !defined(WIN32)
#define _BITMAPINFOHEADER_
typedef struct
-#ifdef HAVE_ATTRIBUTE_PACKED
- __attribute__((__packed__))
-#endif
+ATTR_PACKED
{
uint32_t biSize;
uint32_t biWidth;
} BITMAPINFOHEADER, *PBITMAPINFOHEADER, *LPBITMAPINFOHEADER;
typedef struct
-#ifdef HAVE_ATTRIBUTE_PACKED
- __attribute__((__packed__))
-#endif
+ATTR_PACKED
{
BITMAPINFOHEADER bmiHeader;
int bmiColors[1];
#ifndef _RECT32_
#define _RECT32_
typedef struct
-#ifdef HAVE_ATTRIBUTE_PACKED
- __attribute__((__packed__))
-#endif
+ATTR_PACKED
{
int left, top, right, bottom;
} RECT32;
#ifndef _VIDEOINFOHEADER_
#define _VIDEOINFOHEADER_
typedef struct
-#ifdef HAVE_ATTRIBUTE_PACKED
- __attribute__((__packed__))
-#endif
+ATTR_PACKED
{
RECT32 rcSource;
RECT32 rcTarget;
#ifndef _RGBQUAD_
#define _RGBQUAD_
typedef struct
-#ifdef HAVE_ATTRIBUTE_PACKED
- __attribute__((__packed__))
-#endif
+ATTR_PACKED
{
uint8_t rgbBlue;
uint8_t rgbGreen;
#ifndef _TRUECOLORINFO_
#define _TRUECOLORINFO_
typedef struct
-#ifdef HAVE_ATTRIBUTE_PACKED
- __attribute__((__packed__))
-#endif
+ATTR_PACKED
{
uint32_t dwBitMasks[3];
RGBQUAD1 bmiColors[256];
#ifndef _VIDEOINFO_
#define _VIDEOINFO_
typedef struct
-#ifdef HAVE_ATTRIBUTE_PACKED
- __attribute__((__packed__))
-#endif
+ATTR_PACKED
{
RECT32 rcSource;
RECT32 rcTarget;
{ WAVE_FORMAT_DIVIO_AAC, VLC_FOURCC( 'm', 'p', '4', 'a' ), "MPEG-4 Audio (Divio)" },
{ WAVE_FORMAT_AAC, VLC_FOURCC( 'm', 'p', '4', 'a' ), "MPEG-4 Audio" },
{ WAVE_FORMAT_FFMPEG_AAC, VLC_FOURCC( 'm', 'p', '4', 'a' ), "MPEG-4 Audio" },
- { WAVE_FORMAT_VORBIS, VLC_FOURCC( 'v', 'o', 'r', 'b' ), "Vorbis Audio" },
+ { WAVE_FORMAT_VORBIS, VLC_FOURCC( 'v', 'o', 'r', 'b' ), "Vorbis Audio" },
{ WAVE_FORMAT_VORB_1, VLC_FOURCC( 'v', 'o', 'r', '1' ), "Vorbis 1 Audio" },
{ WAVE_FORMAT_VORB_1PLUS, VLC_FOURCC( 'v', 'o', '1', '+' ), "Vorbis 1+ Audio" },
{ WAVE_FORMAT_VORB_2, VLC_FOURCC( 'v', 'o', 'r', '2' ), "Vorbis 2 Audio" },
unsigned int i_scale_h;
unsigned int i_scale_v;
unsigned int i_alpha;
- vlc_bool_t b_smooth;
+ bool b_smooth;
mtime_t i_fade_in;
mtime_t i_fade_out;
unsigned int i_align;
mtime_t i_time_offset;
- vlc_bool_t b_forced_subs;
+ bool b_forced_subs;
unsigned int palette[16];
unsigned int colors[4];