Show
Ignore:
Timestamp:
05/22/08 16:45:06 (6 months ago)
Author:
astrange
Message:

Merge trunk to 1.1 branch.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/perian-1.1

    • Property svn:externals changed from
      ffmpeg -r11099 svn://svn.mplayerhq.hu/ffmpeg/trunk
      libebml -r1297 http://svn.matroska.org/svn/matroska/trunk/libebml
      libmatroska -r1297 http://svn.matroska.org/svn/matroska/trunk/libmatroska
      a52codec -r61 http://svn.cod3r.com/a52codec/trunk
       to
      ffmpeg -r 13239 svn://svn.mplayerhq.hu/ffmpeg/trunk
      libebml -r 1306 https://services.corecodec.com/svn/matroska/trunk/libebml
      libmatroska -r 1306 https://services.corecodec.com/svn/matroska/trunk/libmatroska
      a52codec -r 64 http://svn.cod3r.com/a52codec/trunk

  • branches/perian-1.1/CAPublicUtility/CAStreamBasicDescription.cpp

    r741 r887  
    5050        #include <Endian.h> 
    5151#endif 
    52  
    53 #import "CodecIDs.h" 
    5452 
    5553const AudioStreamBasicDescription       CAStreamBasicDescription::sEmpty = { 0.0, 0, 0, 0, 0, 0, 0, 0, 0 }; 
    …… 
    274272                 
    275273                case kAudioFormatAC3: 
    276                 case kAudioFormatAC3MS: 
    277274                        strcpy(outName, "AC-3"); 
    278275                        break;