--- plugins/video/H.263-1998/h263-1998.cxx 2013-03-14 12:51:48.000000000 +0100 +++ ../opal_patch/plugins/video/H.263-1998/h263-1998.cxx 2013-03-13 14:45:46.000000000 +0100 @@ -43,6 +43,12 @@ * $Date: 2012-10-02 07:34:04 +0200 (Tue, 02 Oct 2012) $ */ +#define CODEC_FLAG_H263P_UMV 0x02000000 +#define CODEC_FLAG_H263P_SLICE_STRUCT 0x10000000 +#define CODEC_FLAG_H263P_AIV 0x00000008 +#define CODEC_FLAG_OBMC 0x00000001 +#define FF_I_TYPE 1 + #ifndef PLUGIN_CODEC_DLL_EXPORTS #include "plugin-config.h" #endif @@ -94,7 +100,7 @@ { CIF16_WIDTH, CIF16_HEIGHT, PLUGINCODEC_CIF16_MPI }, }; -static FFMPEGLibrary FFMPEGLibraryInstance(CODEC_ID_H263P); +static FFMPEGLibrary FFMPEGLibraryInstance(AV_CODEC_ID_H263P); ///////////////////////////////////////////////////////////////////////////// @@ -203,7 +209,7 @@ PTRACE(4, m_prefix, "Encoder closed"); } -bool H263_Base_EncoderContext::Init(CodecID codecId) +bool H263_Base_EncoderContext::Init(AVCodecID codecId) { PTRACE(5, m_prefix, "Opening encoder"); @@ -592,7 +598,7 @@ bool H263_RFC2190_EncoderContext::Init() { - if (!H263_Base_EncoderContext::Init(CODEC_ID_H263)) + if (!H263_Base_EncoderContext::Init(AV_CODEC_ID_H263)) return false; #if LIBAVCODEC_RTP_MODE @@ -629,7 +635,7 @@ bool H263_RFC2429_EncoderContext::Init() { - return H263_Base_EncoderContext::Init(CODEC_ID_H263P); + return H263_Base_EncoderContext::Init(AV_CODEC_ID_H263P); } @@ -653,7 +659,7 @@ if (!FFMPEGLibraryInstance.Load()) return; - if ((m_codec = FFMPEGLibraryInstance.AvcodecFindDecoder(CODEC_ID_H263)) == NULL) { + if ((m_codec = FFMPEGLibraryInstance.AvcodecFindDecoder(AV_CODEC_ID_H263)) == NULL) { PTRACE(1, m_prefix, "Codec not found for decoder"); return; }