Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/xine-lib/patches/xine-lib-1.1.0-faad-64bit.patch

    Contents of /trunk/xine-lib/patches/xine-lib-1.1.0-faad-64bit.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 153 - (show annotations) (download)
    Tue May 8 20:52:56 2007 UTC (17 years ago) by niro
    File size: 2940 byte(s) 
    -import
    1 Index: xine-lib-1.1.0/src/libfaad/structs.h
    2 ===================================================================
    3 --- xine-lib-1.1.0.orig/src/libfaad/structs.h
    4 +++ xine-lib-1.1.0/src/libfaad/structs.h
    5 @@ -307,58 +307,58 @@ typedef struct
    6 typedef struct mp4AudioSpecificConfig
    7 {
    8 /* Audio Specific Info */
    9 - uint8_t objectTypeIndex;
    10 - uint8_t samplingFrequencyIndex;
    11 - uint32_t samplingFrequency;
    12 - uint8_t channelsConfiguration;
    13 + unsigned char objectTypeIndex;
    14 + unsigned char samplingFrequencyIndex;
    15 + unsigned long samplingFrequency;
    16 + unsigned char channelsConfiguration;
    17
    18 /* GA Specific Info */
    19 - uint8_t frameLengthFlag;
    20 - uint8_t dependsOnCoreCoder;
    21 - uint16_t coreCoderDelay;
    22 - uint8_t extensionFlag;
    23 - uint8_t aacSectionDataResilienceFlag;
    24 - uint8_t aacScalefactorDataResilienceFlag;
    25 - uint8_t aacSpectralDataResilienceFlag;
    26 - uint8_t epConfig;
    27 + unsigned char frameLengthFlag;
    28 + unsigned char dependsOnCoreCoder;
    29 + unsigned short coreCoderDelay;
    30 + unsigned char extensionFlag;
    31 + unsigned char aacSectionDataResilienceFlag;
    32 + unsigned char aacScalefactorDataResilienceFlag;
    33 + unsigned char aacSpectralDataResilienceFlag;
    34 + unsigned char epConfig;
    35
    36 - int8_t sbr_present_flag;
    37 - int8_t forceUpSampling;
    38 + char sbr_present_flag;
    39 + char forceUpSampling;
    40 } mp4AudioSpecificConfig;
    41
    42 typedef struct faacDecConfiguration
    43 {
    44 - uint8_t defObjectType;
    45 - uint32_t defSampleRate;
    46 - uint8_t outputFormat;
    47 - uint8_t downMatrix;
    48 - uint8_t useOldADTSFormat;
    49 - uint8_t dontUpSampleImplicitSBR;
    50 + unsigned char defObjectType;
    51 + unsigned long defSampleRate;
    52 + unsigned char outputFormat;
    53 + unsigned char downMatrix;
    54 + unsigned char useOldADTSFormat;
    55 + unsigned char dontUpSampleImplicitSBR;
    56 } faacDecConfiguration, *faacDecConfigurationPtr;
    57
    58 typedef struct faacDecFrameInfo
    59 {
    60 - uint32_t bytesconsumed;
    61 - uint32_t samples;
    62 - uint8_t channels;
    63 - uint8_t error;
    64 - uint32_t samplerate;
    65 + unsigned long bytesconsumed;
    66 + unsigned long samples;
    67 + unsigned char channels;
    68 + unsigned char error;
    69 + unsigned long samplerate;
    70
    71 /* SBR: 0: off, 1: on; normal, 2: on; downsampled */
    72 - uint8_t sbr;
    73 + unsigned char sbr;
    74
    75 /* MPEG-4 ObjectType */
    76 - uint8_t object_type;
    77 + unsigned char object_type;
    78
    79 /* AAC header type; MP4 will be signalled as RAW also */
    80 - uint8_t header_type;
    81 + unsigned char header_type;
    82
    83 /* multichannel configuration */
    84 - uint8_t num_front_channels;
    85 - uint8_t num_side_channels;
    86 - uint8_t num_back_channels;
    87 - uint8_t num_lfe_channels;
    88 - uint8_t channel_position[MAX_CHANNELS];
    89 + unsigned char num_front_channels;
    90 + unsigned char num_side_channels;
    91 + unsigned char num_back_channels;
    92 + unsigned char num_lfe_channels;
    93 + unsigned char channel_position[MAX_CHANNELS];
    94 } faacDecFrameInfo;
    95
    96 typedef struct