Changeset 906

Show
Ignore:
Timestamp:
06/02/08 13:05:14 (6 months ago)
Author:
astrange
Message:

Merge r905 to the branch.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/perian-1.1/bitstream_info.c

    r887 r906  
    1818 
    1919#include "avcodec.h" 
    20  
    21 #ifdef __BIG_ENDIAN__ 
    22 #define WORDS_BIGENDIAN 
    23 #endif 
    2420 
    2521#include "bswap.h" 
    …… 
    123119        uint8_t half = ac3_halfrate[bsid]; 
    124120        int sample_rate = ac3_freqs[fscod] >> half; 
    125         int framesize; 
     121        int framesize = 0; 
    126122        switch (fscod) { 
    127123                case 0: 
    …… 
    149145        else 
    150146                asbd->mFormatID = kAudioFormatAC3MS; 
    151         asbd->mFramesPerPacket = 1; 
    152147        asbd->mChannelsPerFrame = nfchans_tbl[acmod] + lfe; 
    153148