Clear conflict declaration error (#161)

- Update AudioEncoder.h - Update MP4Recording.h
Ameba-AIoT · Dec 8, 2023 · 39cdadd · 39cdadd
1 parent 1ad9068
commit 39cdadd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/Arduino_package/hardware/libraries/Multimedia/src/AudioEncoder.h b/Arduino_package/hardware/libraries/Multimedia/src/AudioEncoder.h
@@ -1,12 +1,16 @@
 #ifndef __AUDIOENCODER_H__
 #define __AUDIOENCODER_H__
 
+#define INT machine_type_t
+#include "module_aac.h"
+#undef INT
+
 #include "VideoStream.h"
 #include "AudioStream.h"
 
 #include "faac.h"
 #include "faaccfg.h"
-#include "module_aac.h"
+//#include "module_aac.h"
 #include "module_g711.h"
 
 class AAC:public MMFModule {

diff --git a/Arduino_package/hardware/libraries/Multimedia/src/MP4Recording.h b/Arduino_package/hardware/libraries/Multimedia/src/MP4Recording.h
@@ -1,9 +1,12 @@
 #ifndef __MP4_RECORDING_H__
 #define __MP4_RECORDING_H__
 
-#include "mmf2_module.h"
+#define INT mp4_muxer_t
 #include "mp4_muxer.h"
+#undef INT
 
+#include "mmf2_module.h"
+//#include "mp4_muxer.h"
 #include "VideoStream.h"
 #include "AudioStream.h"