Changeset cdb14e56c12730d6a193f07dcb8e0398215e1fad

Show
Ignore:
Timestamp:
07/03/08 22:51:05 (2 months ago)
Author:
Laurent Aimar <fenrir@videolan.org>
git-committer:
Laurent Aimar <fenrir@videolan.org> 1215118265 +0000
git-parent:

[ff396882d74d14db4d76536997f288a701a55851]

git-author:
Laurent Aimar <fenrir@videolan.org> 1215110056 +0000
Message:

Fixed playing of some twos/sowt samples (close #1621)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • modules/demux/mp4/mp4.c

    r86682a8 rcdb14e5  
    13931393    p_track->p_sample = p_sample; 
    13941394 
    1395     if( p_track->fmt.i_cat == AUDIO_ES && p_track->i_sample_size == 1
     1395    if( p_track->fmt.i_cat == AUDIO_ES && ( p_track->i_sample_size == 1 || p_track->i_sample_size == 2 )
    13961396    { 
    13971397        MP4_Box_data_sample_soun_t *p_soun; 
     
    14281428                    p_soun->i_samplesize = 8; 
    14291429                    break; 
     1430                case VLC_FOURCC( 't', 'w', 'o', 's' ): 
     1431                case VLC_FOURCC( 's', 'o', 'w', 't' ): 
     1432                    /* What would be the fun if you could trust the .mov */ 
     1433                    p_track->i_sample_size = ((p_soun->i_samplesize+7)/8) * p_soun->i_channelcount; 
     1434                    break; 
    14301435                default: 
    14311436                    break; 
     
    14381443        } 
    14391444    } 
    1440  
    14411445 
    14421446    /* It's a little ugly but .. there are special cases */