Fix CodecID changes in recent libav libraries
parent
33cbd89212
commit
6af58aca09
|
@ -52,6 +52,13 @@ extern "C" {
|
|||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
#if LIBAVCODEC_BUILD >= CALC_FFMPEG_VERSION(54,25,0)
|
||||
typedef AVCodecID ZmCodecID;
|
||||
#else
|
||||
typedef CodecID ZmCodecID;
|
||||
#endif
|
||||
|
||||
#if FFMPEG_VERSION_INT == 0x000408
|
||||
#define ZM_FFMPEG_048 1
|
||||
#elif FFMPEG_VERSION_INT == 0x000409
|
||||
|
|
|
@ -41,7 +41,7 @@ protected:
|
|||
int payloadType;
|
||||
const char payloadName[6];
|
||||
enum AVMediaType codecType;
|
||||
enum CodecID codecId;
|
||||
enum ZmCodecID codecId;
|
||||
int clockRate;
|
||||
int autoChannels;
|
||||
};
|
||||
|
@ -50,7 +50,7 @@ protected:
|
|||
{
|
||||
const char payloadName[32];
|
||||
enum AVMediaType codecType;
|
||||
enum CodecID codecId;
|
||||
enum ZmCodecID codecId;
|
||||
//int clockRate;
|
||||
//int autoChannels;
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue