Changeset 806 for trunk/CAPublicUtility

Timestamp:

02/09/08 13:55:44 (10 months ago)

Author:

astrange

Message:

Merge 1.1 to trunk. If you're switching, delete ffmpeg/ first!
I haven't merged the nib changes, so the component manager is missing again.

Files:

• trunk/CAPublicUtility/CAStreamBasicDescription.cpp (modified) (2 diffs)

trunk/CAPublicUtility/CAStreamBasicDescription.cpp

@@ -50 +50 @@
-        #include <Endian.h>
-#endif
+
+#import "CodecIDs.h"
-
-const AudioStreamBasicDescription       CAStreamBasicDescription::sEmpty = { 0.0, 0, 0, 0, 0, 0, 0, 0, 0 };
@@ -272 +274 @@
-                
-                case kAudioFormatAC3:
+                case kAudioFormatAC3MS:
-                        strcpy(outName, "AC-3");
-                        break;