Changeset 260

Timestamp:

01/06/07 21:36:26 (2 years ago)

Author:

dconrad

Message:

Fix calling of GetDefaultChannelLayout?() from initialize_audio_map()

Files:

• trunk/MatroskaCodecIDs.cpp (modified) (2 diffs)
• trunk/MatroskaCodecIDs.h (modified) (2 diffs)
• trunk/ff_private.c (modified) (2 diffs)

trunk/MatroskaCodecIDs.cpp

@@ -573 +573 @@
-};
-
-extern "C"{
-
-AudioChannelLayout GetDefaultChannelLayout(AudioStreamBasicDescription *asbd)
-{
@@ -601 +599 @@
-}
-
-}
-
-ComponentResult MkvFinishASBD(KaxTrackEntry *tr_entry, AudioStreamBasicDescription *asbd)

trunk/MatroskaCodecIDs.h

@@ -28 +28 @@
-#include <QuickTime/QuickTime.h>
-#include <AudioToolbox/AudioToolbox.h>
+
+#ifdef __cplusplus
-#include <matroska/KaxTracks.h>
-#include <matroska/KaxTrackEntryData.h>
@@ -53 +55 @@
-ComponentResult MkvFinishASBD(KaxTrackEntry *tr_entry, AudioStreamBasicDescription *asbd);
-FourCharCode GetFourCC(KaxTrackEntry *tr_entry);
+
-extern "C"{
+#endif
+
-AudioChannelLayout GetDefaultChannelLayout(AudioStreamBasicDescription *asbd);
+
+#ifdef __cplusplus
-}
-#endif
+#endif

trunk/ff_private.c

@@ -33 +33 @@
-
-#include "bitstream_info.h"
+#include "MatroskaCodecIDs.h"
-
-/* This routine checks if the system requirements are fullfilled */
@@ -259 +260 @@
-        if(useDefault && asbd.mChannelsPerFrame > 2)
-        {
-.mChannelLayoutTag = GetDefaultChannelLayout(
+ = GetDefaultChannelLayout(&asbd
-                aclSize = sizeof(AudioChannelLayout);
-        }