Fixed build on MacOS

kala13x · Sep 23, 2024 · 700056a · 700056a
1 parent ac7e212
commit 700056a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -20,7 +20,6 @@ set(SOURCES
 )
 
 add_library(${PROJECT_NAME} STATIC ${SOURCES})
-SET(DST_DIR "/usr/local/include/xmedia")
 
 target_link_libraries(${PROJECT_NAME}
     xutils
@@ -33,5 +32,5 @@ target_link_libraries(${PROJECT_NAME}
     swresample
 )
 
-install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION /usr/local/lib)
-install(DIRECTORY ${PROJECT_SOURCE_DIR}/src/ DESTINATION  ${DST_DIR} FILES_MATCHING PATTERN "*.h")
+install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION lib)
+install(DIRECTORY ${PROJECT_SOURCE_DIR}/src/ DESTINATION xmedia FILES_MATCHING PATTERN "*.h")
diff --git a/src/encoder.h b/src/encoder.h
@@ -24,7 +24,12 @@ extern "C" {
 typedef void(*xencoder_stat_cb_t)(void *pUserCtx, const char *pStatus);
 typedef void(*xencoder_err_cb_t)(void *pUserCtx, const char *pErrStr);
 typedef int(*xencoder_pkt_cb_t)(void *pUserCtx, AVPacket *pPacket);
+
+#ifdef __APPLE__
+typedef int(*xmuxer_cb_t)(void *pUserCtx, const uint8_t *pData, int nSize);
+#else
 typedef int(*xmuxer_cb_t)(void *pUserCtx, uint8_t *pData, int nSize);
+#endif
 
 #define XENCODER_IO_SIZE  (1024 * 64)
 

diff --git a/src/stdinc.h b/src/stdinc.h
@@ -35,13 +35,13 @@
  and we need to use the new AVChannelLayout structure instead.
 */
 #ifndef XCODEC_USE_NEW_CHANNEL
-  #if FF_API_OLD_CHANNEL_LAYOUT
+  #if defined(FF_API_OLD_CHANNEL_LAYOUT) || defined(__APPLE__)
     #define XCODEC_USE_NEW_CHANNEL 1
   #endif
 #endif
 
 #ifndef XCODEC_USE_NEW_FIFO
-  #if FF_API_FIFO_OLD_API
+  #if defined(FF_API_FIFO_OLD_API) || defined(__APPLE__)
     #define XCODEC_USE_NEW_FIFO 1
   #endif
 #endif