Commit 8bf18241 authored by nextime's avatar nextime

Ok, this time it will work?

parent 7cb43d0e
......@@ -53,12 +53,6 @@ extern "C" {
#endif
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(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,11 @@ protected:
int payloadType;
const char payloadName[6];
enum AVMediaType codecType;
enum ZmCodecID codecId;
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54,25,0)
enum AVCodecID codecId;
#else
enum CodecID codecId;
#endif
int clockRate;
int autoChannels;
};
......@@ -50,7 +54,12 @@ protected:
{
const char payloadName[32];
enum AVMediaType codecType;
enum ZmCodecID codecId;
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54,25,0)
enum AVCodecID codecId;
#else
enum CodecID codecId;
#endif
//int clockRate;
//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