Skip to content

Commit

Permalink
Fix enum typedef.
Browse files Browse the repository at this point in the history
  • Loading branch information
Underground78 authored and Nevcairiel committed Jun 5, 2015
1 parent 0834302 commit 9ed2bee
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion common/includes/ITrackInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ typedef enum TrackType {
TypeLogo = 0x10,
TypeSubtitle = 0x11,
TypeControl = 0x20
};
} TrackType;

#pragma pack(push, 1)

Expand Down
8 changes: 4 additions & 4 deletions decoder/LAVAudio/LAVAudioSettings.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ typedef enum LAVAudioCodec {
Codec_ATRAC,

Codec_AudioNB // Number of entries (do not use when dynamically linking)
};
} LAVAudioCodec;

// Bitstreaming Codecs supported in LAV Audio
typedef enum LAVBitstreamCodec {
Expand All @@ -69,7 +69,7 @@ typedef enum LAVBitstreamCodec {
Bitstream_DTSHD,

Bitstream_NB // Number of entries (do not use when dynamically linking)
};
} LAVBitstreamCodec;


// Supported Sample Formats in LAV Audio
Expand All @@ -83,15 +83,15 @@ typedef enum LAVAudioSampleFormat {
SampleFormat_Bitstream,

SampleFormat_NB // Number of entries (do not use when dynamically linking)
};
} LAVAudioSampleFormat;

typedef enum LAVAudioMixingMode {
MatrixEncoding_None,
MatrixEncoding_Dolby,
MatrixEncoding_DPLII,

MatrixEncoding_NB
};
} LAVAudioMixingMode;

// LAV Audio configuration interface
[uuid("4158A22B-6553-45D0-8069-24716F8FF171")]
Expand Down
16 changes: 8 additions & 8 deletions decoder/LAVVideo/LAVVideoSettings.h
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ typedef enum LAVVideoCodec {
Codec_VP7,

Codec_VideoNB // Number of entries (do not use when dynamically linking)
};
} LAVVideoCodec;

// Codecs with hardware acceleration
typedef enum LAVVideoHWCodec {
Expand All @@ -101,7 +101,7 @@ typedef enum LAVVideoHWCodec {
HWCodec_HEVC,

HWCodec_NB = HWCodec_HEVC + 1
};
} LAVVideoHWCodec;

// Flags for HW Resolution support
#define LAVHWResFlag_SD 0x0001
Expand All @@ -116,28 +116,28 @@ typedef enum LAVHWAccel {
HWAccel_DXVA2,
HWAccel_DXVA2CopyBack = HWAccel_DXVA2,
HWAccel_DXVA2Native
};
} LAVHWAccel;

// Deinterlace algorithms offered by the hardware decoders
typedef enum LAVHWDeintModes {
HWDeintMode_Weave,
HWDeintMode_BOB, // Deprecated
HWDeintMode_Hardware
};
} LAVHWDeintModes;

// Software deinterlacing algorithms
typedef enum LAVSWDeintModes {
SWDeintMode_None,
SWDeintMode_YADIF
};
} LAVSWDeintModes;

// Deinterlacing processing mode
typedef enum LAVDeintMode {
DeintMode_Auto,
DeintMode_Aggressive,
DeintMode_Force,
DeintMode_Disable
};
} LAVDeintMode;

// Type of deinterlacing to perform
// - FramePerField re-constructs one frame from every field, resulting in 50/60 fps.
Expand All @@ -146,14 +146,14 @@ typedef enum LAVDeintMode {
typedef enum LAVDeintOutput {
DeintOutput_FramePerField,
DeintOutput_FramePer2Field
};
} LAVDeintOutput;

// Control the field order of the deinterlacer
typedef enum LAVDeintFieldOrder {
DeintFieldOrder_Auto,
DeintFieldOrder_TopFieldFirst,
DeintFieldOrder_BottomFieldFirst,
};
} LAVDeintFieldOrder;

// Supported output pixel formats
typedef enum LAVOutPixFmts {
Expand Down

0 comments on commit 9ed2bee

Please sign in to comment.