Commit 6af58aca authored by nextime's avatar nextime

Fix CodecID changes in recent libav libraries

parent 33cbd892
...@@ -52,6 +52,13 @@ extern "C" { ...@@ -52,6 +52,13 @@ extern "C" {
#endif #endif
#endif #endif
#if LIBAVCODEC_BUILD >= CALC_FFMPEG_VERSION(54,25,0)
typedef AVCodecID ZmCodecID;
#else
typedef CodecID ZmCodecID;
#endif
#if FFMPEG_VERSION_INT == 0x000408 #if FFMPEG_VERSION_INT == 0x000408
#define ZM_FFMPEG_048 1 #define ZM_FFMPEG_048 1
#elif FFMPEG_VERSION_INT == 0x000409 #elif FFMPEG_VERSION_INT == 0x000409
......
...@@ -41,7 +41,7 @@ protected: ...@@ -41,7 +41,7 @@ protected:
int payloadType; int payloadType;
const char payloadName[6]; const char payloadName[6];
enum AVMediaType codecType; enum AVMediaType codecType;
enum CodecID codecId; enum ZmCodecID codecId;
int clockRate; int clockRate;
int autoChannels; int autoChannels;
}; };
...@@ -50,7 +50,7 @@ protected: ...@@ -50,7 +50,7 @@ protected:
{ {
const char payloadName[32]; const char payloadName[32];
enum AVMediaType codecType; enum AVMediaType codecType;
enum CodecID codecId; enum ZmCodecID codecId;
//int clockRate; //int clockRate;
//int autoChannels; //int autoChannels;
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment