Use muxer callback function based on avcodec version

kala13x · Nov 6, 2024 · 65e372c · 65e372c
1 parent 8cbe3c0
commit 65e372c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 35 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/example/xmedia.c b/example/xmedia.c
@@ -76,7 +76,11 @@ static void clear_cb(xarray_data_t *pArrData)
     free(pArrData->pData);
 }
 
+#if XMEDIA_AVCODEC_VER_AT_LEAST(5, 7)
+static int muxer_cb(void *pCtx, const uint8_t *pData, int nSize)
+#else
 static int muxer_cb(void *pCtx, uint8_t *pData, int nSize)
+#endif
 {
     xlogd("Muxer callback: size(%d)", nSize);
     xtranscoder_t *pTransmuxer = (xtranscoder_t*)pCtx;

diff --git a/src/encoder.h b/src/encoder.h
@@ -25,7 +25,7 @@ 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__
+#if XMEDIA_AVCODEC_VER_AT_LEAST(5, 7)
 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);