Index: head/net/opal/Makefile =================================================================== --- head/net/opal/Makefile (revision 468851) +++ head/net/opal/Makefile (revision 468852) @@ -1,300 +1,300 @@ # Created by: Roger Hardiman # $FreeBSD$ PORTNAME= opal PORTVERSION= 3.10.10 -PORTREVISION= 17 +PORTREVISION= 18 CATEGORIES= net MASTER_SITES= GNOME MAINTAINER= gnome@FreeBSD.org COMMENT= VoIP abstraction library LICENSE= MPL10 LIB_DEPENDS= libpt.so:devel/ptlib USES= gmake pathfix pkgconfig tar:xz GNU_CONFIGURE= yes USE_LDCONFIG= yes CXXFLAGS+= -I${LOCALBASE}/include CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= JAVA CELT ILBC GSM SPEEX THEORA FFMPEG X264 SIP H323 IAX \ H224 H281 FAX MSRP SIPIM RTPTEXT H450 H460 H501 LID UVIDEO \ AEC DEBUG RUBY # ZRTP # MSRP = plist extra line vpd? # RTPTEXT disable == build fail, so make it default? OPTIONS_DEFAULT=CELT GSM SPEEX FFMPEG X264 SIP H224 H281 FAX MSRP SIPIM \ RTPTEXT LID AEC DEBUG_DESC= Install debug library ZRTP_DESC= ZRTP protocol support JAVA_DESC= Java JNI support RUBY_DESC= Ruby support CELT_DESC= Celt codec from ports ILBC_DESC= iLBC codec from ports GSM_DESC= GSM 06.10 codec from ports SPEEX_DESC= SPEEX codec from ports THEORA_DESC= Theora codec support FFMPEG_DESC= Ffmpeg codec support X264_DESC= x.264 codec support SIP_DESC= SIP protocol support H323_DESC= H.323 protocol support IAX_DESC= IAX2 protocol support H224_DESC= H.224 control protocol H281_DESC= H.281 (Far End Camera Control) protocol support FAX_DESC= Fax T.38 support MSRP_DESC= MSRP protocol SIPIM_DESC= SIP-IM protocol RTPTEXT_DESC= RFC4103 Text RTP payload support H450_DESC= H.450 H.323 subset H460_DESC= H.460 H.323 extension for NAT traversal H501_DESC= H.501 H323 mobility extensions LID_DESC= Light-Weight Identity (incl. xJack cards and voicetronix vpb) support UVIDEO_DESC= RFC4175 uncompressed video RTP payload AEC_DESC= Accoustic echo cancellation .include .ifdef OPALDIR .error OPALDIR is defined as an environment variable, or in the arguments \ to "make". Please unset it and restart the build. .endif PLIST_SUB+= VERSION=${PORTVERSION} \ PVERSION_MAJOR=${PVERSION_MAJOR} \ PVERSION_MINOR=${PVERSION_MINOR} PVERSION_MAJOR= ${PORTVERSION:C/.[0-9]+.[0-9]+$//g} PVERSION_MINOR= ${PORTVERSION:C/.[0-9]+$//g} .if ${PORT_OPTIONS:MDEBUG} ALL_TARGET= debug opt PLIST_SUB+= DEBUG="" .else ALL_TARGET= opt PLIST_SUB+= DEBUG="@comment " .endif # libzrtpcpp uses port ssl, which will conflict with this port since we use # base ssl. #.if ${PORT_OPTIONS:MZRTP} .if 0 .if !defined(SAFE_ZRTP) IGNORE= please build devel/libzrtpcpp WITHOUT ports SSL and re-run build with SAFE_ZRTP set .endif LIB_DEPENDS+= libzrtpcpp.so:devel/libzrtpcpp CONFIGURE_ARGS+= --enable-zrtp .else CONFIGURE_ARGS+= --disable-zrtp .endif .if ${PORT_OPTIONS:MGSM} LIB_DEPENDS+= libgsm.so:audio/gsm .else CONFIGURE_ARGS+= --enable-localgsm .endif .if ${PORT_OPTIONS:MSPEEX} LIB_DEPENDS+= libspeex.so:audio/speex .else CONFIGURE_ARGS+= --enable-localspeex .endif .if ${PORT_OPTIONS:MJAVA} CONFIGURE_ARGS+= --enable-java .else CONFIGURE_ARGS+= --disable-java .endif .if ${PORT_OPTIONS:MRUBY} CONFIGURE_ARGS+= --enable-ruby .else CONFIGURE_ARGS+= --disable-ruby .endif .if ${PORT_OPTIONS:MCELT} LIB_DEPENDS+= libcelt0.so:audio/celt CONFIGURE_ARGS+= --enable-celt PLIST_SUB+= CELT="" .else CONFIGURE_ARGS+= --disable-celt PLIST_SUB+= CELT="@comment " .endif .if ${PORT_OPTIONS:MILBC} LIB_DEPENDS+= libilbc.so:net/ilbc .else CONFIGURE_ARGS+= --enable-localilbc .endif .if ${PORT_OPTIONS:MTHEORA} LIB_DEPENDS+= libtheora.so:multimedia/libtheora CONFIGURE_ARGS+= --enable-theora PLIST_SUB+= THEORA="" WITH_VIDEO= yes .else CONFIGURE_ARGS+= --disable-theora PLIST_SUB+= THEORA="@comment " .endif .if ${PORT_OPTIONS:MX264} && ${PORT_OPTIONS:MFFMPEG} LIB_DEPENDS+= libx264.so:multimedia/libx264 CONFIGURE_ARGS+= --enable-x264 PLIST_SUB+= X264="" WITH_VIDEO= yes # work around some weirdness in plugins/configure where it looses the # cflags/libs of x264 CONFIGURE_ENV+= X264_CFLAGS="`pkg-config --cflags x264`" \ X264_LIBS="`pkg-config --libs x264`" .else CONFIGURE_ARGS+= --disable-x264 PLIST_SUB+= X264="@comment " .endif .if ${PORT_OPTIONS:MFFMPEG} BUILD_DEPENDS+= ffmpeg>=2:multimedia/ffmpeg RUN_DEPENDS+= ffmpeg>=2:multimedia/ffmpeg CONFIGURE_ARGS+= --enable-libavcodec PLIST_SUB+= FFMPEG="" WITH_VIDEO= yes .else CONFIGURE_ARGS+= --disable-libavcodec PLIST_SUB+= FFMPEG="@comment " .endif WITH_VIDEO=yes .if defined(WITH_VIDEO) CONFIGURE_ARGS+= --enable-video PLIST_SUB+= VIDEO="" .else CONFIGURE_ARGS+= --disable-video PLIST_SUB+= VIDEO="@comment " .endif .if ${PORT_OPTIONS:MSIP} CONFIGURE_ARGS+= --enable-sip .else CONFIGURE_ARGS+= --disable-sip .endif .if ${PORT_OPTIONS:MH323} CONFIGURE_ARGS+= --enable-h323 .else CONFIGURE_ARGS+= --disable-h323 .endif .if ${PORT_OPTIONS:MIAX} CONFIGURE_ARGS+= --enable-iax2 .else CONFIGURE_ARGS+= --disable-iax2 .endif .if ${PORT_OPTIONS:MH224} CONFIGURE_ARGS+= --enable-h224 .else CONFIGURE_ARGS+= --disable-h224 .endif .if ${PORT_OPTIONS:MH281} CONFIGURE_ARGS+= --enable-h281 .else CONFIGURE_ARGS+= --disable-h281 .endif .if ${PORT_OPTIONS:MFAX} LIB_DEPENDS+= libspandsp.so:comms/spandsp CONFIGURE_ARGS+= --enable-spandsp --enable-fax --enable-t38 PLIST_SUB+= FAX="" .else CONFIGURE_ARGS+= --disable-fax --disable-t38 --disable-spandsp PLIST_SUB+= FAX="@comment " .endif .if ${PORT_OPTIONS:MMSRP} CONFIGURE_ARGS+= --enable-msrp ##BROKEN= Does not compile .else CONFIGURE_ARGS+= --disable-msrp .endif .if ${PORT_OPTIONS:MSIPIM} CONFIGURE_ARGS+= --enable-sipim .else CONFIGURE_ARGS+= --disable-sipim .endif .if ${PORT_OPTIONS:MRTPTEXT} CONFIGURE_ARGS+= --enable-rfc4103 .else CONFIGURE_ARGS+= --disable-rfc4103 .endif .if ${PORT_OPTIONS:MH450} CONFIGURE_ARGS+= --enable-h450 .else CONFIGURE_ARGS+= --disable-h450 .endif .if ${PORT_OPTIONS:MH460} CONFIGURE_ARGS+= --enable-h460 .else CONFIGURE_ARGS+= --disable-h460 .endif .if ${PORT_OPTIONS:MH501} CONFIGURE_ARGS+= --enable-h501 .else CONFIGURE_ARGS+= --disable-h501 .endif .if ${PORT_OPTIONS:MLID} CONFIGURE_ARGS+= --enable-lid --enable-ixj --enable-vpb PLIST_SUB+= LID="" .else CONFIGURE_ARGS+= --disable-lid --disable-ixj --disable-vpb PLIST_SUB+= LID="@comment " .endif .if ${PORT_OPTIONS:MUVIDEO} CONFIGURE_ARGS+= --enable-rfc4175 .else CONFIGURE_ARGS+= --disable-rfc4175 .endif # xxxx .if ${PORT_OPTIONS:MXXXX} CONFIGURE_ARGS+= --enable-rfc2435 .else CONFIGURE_ARGS+= --disable-rfc2435 .endif .if ${PORT_OPTIONS:MAEC} CONFIGURE_ARGS+= --enable-aec .else CONFIGURE_ARGS+= --disable-aec .endif # ?? CONFIGURE_ARGS+= --disable-debug # configure flags not used CONFIGURE_ARGS+= --disable-gsmamr \ --disable-ruby post-install: ${LN} -sf libopal.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libopal.so.${PVERSION_MAJOR} ${LN} -sf libopal.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libopal.so.${PVERSION_MINOR} .if ${PORT_OPTIONS:MDEBUG} ${LN} -sf libopal_d.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libopal_d.so.${PVERSION_MAJOR} ${LN} -sf libopal_d.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libopal_d.so.${PVERSION_MINOR} .endif @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libopal.so.${PORTVERSION} @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/opal-${PORTVERSION}/codecs/video/h264_video_pwplugin_helper @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/opal-${PORTVERSION}/*/*.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/opal-${PORTVERSION}/*/*/*.so .include Index: head/net/opal/files/patch-ffmpeg4 =================================================================== --- head/net/opal/files/patch-ffmpeg4 (revision 468851) +++ head/net/opal/files/patch-ffmpeg4 (revision 468852) @@ -1,262 +1,262 @@ h263-1998.cxx:237:22: error: use of undeclared identifier 'CODEC_FLAG_TRUNCATED' m_context->flags = CODEC_FLAG_TRUNCATED // Possible missing packets ^ h263-1998.cxx:346:27: error: use of undeclared identifier 'CODEC_FLAG_AC_PRED' m_context->flags |= CODEC_FLAG_AC_PRED; ^ h263-1998.cxx:348:28: error: use of undeclared identifier 'CODEC_FLAG_AC_PRED' m_context->flags &= ~CODEC_FLAG_AC_PRED; ^ h263-1998.cxx:356:27: error: use of undeclared identifier 'CODEC_FLAG_LOOP_FILTER' m_context->flags |= CODEC_FLAG_LOOP_FILTER; ^ h263-1998.cxx:358:28: error: use of undeclared identifier 'CODEC_FLAG_LOOP_FILTER' m_context->flags &= ~CODEC_FLAG_LOOP_FILTER; ^ h263-1998.cxx:422:14: error: no member named 'lmin' in 'AVCodecContext'; did you mean 'qmin'? m_context->lmin = m_context->qmin * FF_QP2LAMBDA; ^~~~ qmin /usr/local/include/libavcodec/avcodec.h:2355:9: note: 'qmin' declared here int qmin; ^ h263-1998.cxx:423:14: error: no member named 'lmax' in 'AVCodecContext'; did you mean 'qmax'? m_context->lmax = m_context->qmax * FF_QP2LAMBDA; ^~~~ qmax /usr/local/include/libavcodec/avcodec.h:2362:9: note: 'qmax' declared here int qmax; ^ h263-1998.cxx:598:24: error: use of undeclared identifier 'CODEC_FLAG_4MV' m_context->flags &= ~CODEC_FLAG_4MV; ^ rfc2429.cxx:289:55: error: use of undeclared identifier 'FF_INPUT_BUFFER_PADDING_SIZE' memset (m_encodedFrame.ptr + m_encodedFrame.pos,0 , FF_INPUT_BUFFER_PADDING_SIZE); ^ rfc2429.cxx:343:79: error: use of undeclared identifier 'FF_INPUT_BUFFER_PADDING_SIZE' if ((m_encodedFrame.pos + (headerP ? 2 : 0) + remBytes) > (m_maxFrameSize - FF_INPUT_BUFFER_PADDING_SIZE)) { ^ rfc2429.cxx:346:80: error: use of undeclared identifier 'FF_INPUT_BUFFER_PADDING_SIZE' << " bytes while maximum frame size is " << m_maxFrameSize << "-" << FF_INPUT_BUFFER_PADDING_SIZ... ^ h264-x264.cxx:1079:27: error: use of undeclared identifier 'CODEC_FLAG2_DROP_FRAME_TIMECODE' m_context->flags2 = CODEC_FLAG2_DROP_FRAME_TIMECODE | ^ h264-x264.cxx:1081:27: error: use of undeclared identifier 'CODEC_FLAG2_CHUNKS' CODEC_FLAG2_CHUNKS; ^ mpeg4.cxx:551:18: error: no member named 'rc_eq' in 'AVCodecContext' m_avcontext->rc_eq = (char*) "1"; ~~~~~~~~~~~ ^ mpeg4.cxx:556:18: error: no member named 'rc_initial_cplx' in 'AVCodecContext' m_avcontext->rc_initial_cplx = 0.0f; ~~~~~~~~~~~ ^ mpeg4.cxx:563:18: error: no member named 'rc_buffer_aggressivity' in 'AVCodecContext' m_avcontext->rc_buffer_aggressivity = 1.0f; ~~~~~~~~~~~ ^ mpeg4.cxx:597:25: error: use of undeclared identifier 'CODEC_FLAG_AC_PRED' m_avcontext->flags|=CODEC_FLAG_AC_PRED; ^ mpeg4.cxx:600:25: error: use of undeclared identifier 'CODEC_FLAG_4MV' m_avcontext->flags|=CODEC_FLAG_4MV; ^ mpeg4.cxx:601:25: error: use of undeclared identifier 'CODEC_FLAG_LOOP_FILTER' m_avcontext->flags|=CODEC_FLAG_LOOP_FILTER; ^ mpeg4.cxx:639:18: error: no member named 'lmin' in 'AVCodecContext'; did you mean 'qmin'? m_avcontext->lmin = m_avcontext->qmin * FF_QP2LAMBDA; ^~~~ qmin /usr/local/include/libavcodec/avcodec.h:2355:9: note: 'qmin' declared here int qmin; ^ mpeg4.cxx:640:18: error: no member named 'lmax' in 'AVCodecContext'; did you mean 'qmax'? m_avcontext->lmax = m_avcontext->qmax * FF_QP2LAMBDA; ^~~~ qmax /usr/local/include/libavcodec/avcodec.h:2362:9: note: 'qmax' declared here int qmax; ^ mpeg4.cxx:668:49: error: use of undeclared identifier 'FF_INPUT_BUFFER_PADDING_SIZE' m_rawFrameBuffer = new BYTE[m_rawFrameLen + FF_INPUT_BUFFER_PADDING_SIZE]; ^ mpeg4.cxx:678:49: error: use of undeclared identifier 'FF_INPUT_BUFFER_PADDING_SIZE' memset(m_rawFrameBuffer + m_rawFrameLen, 0, FF_INPUT_BUFFER_PADDING_SIZE); ^ mpeg4.cxx:1329:27: error: use of undeclared identifier 'CODEC_FLAG_4MV' m_avcontext->flags |= CODEC_FLAG_4MV; ^ --- plugins/video/H.263-1998/h263-1998.cxx.orig +++ plugins/video/H.263-1998/h263-1998.cxx @@ -234,7 +234,7 @@ bool H263_Base_EncoderContext::Init(AVCodecID codecId) m_context->opaque = this; - m_context->flags = CODEC_FLAG_TRUNCATED // Possible missing packets + m_context->flags = AV_CODEC_FLAG_TRUNCATED // Possible missing packets ; m_context->pix_fmt = AV_PIX_FMT_YUV420P; @@ -343,9 +343,9 @@ void H263_Base_EncoderContext::SetOption(const char * // Level 3+ // works with eyeBeam if (atoi(value) == 1) - m_context->flags |= CODEC_FLAG_AC_PRED; + m_context->flags |= AV_CODEC_FLAG_AC_PRED; else - m_context->flags &= ~CODEC_FLAG_AC_PRED; + m_context->flags &= ~AV_CODEC_FLAG_AC_PRED; return; } @@ -353,9 +353,9 @@ void H263_Base_EncoderContext::SetOption(const char * // Annex J: Deblocking Filter // works with eyeBeam if (atoi(value) == 1) - m_context->flags |= CODEC_FLAG_LOOP_FILTER; + m_context->flags |= AV_CODEC_FLAG_LOOP_FILTER; else - m_context->flags &= ~CODEC_FLAG_LOOP_FILTER; + m_context->flags &= ~AV_CODEC_FLAG_LOOP_FILTER; return; } @@ -419,8 +419,8 @@ bool H263_Base_EncoderContext::OpenCodec() m_context->qcompress = 0.5; // qscale factor between easy & hard scenes (0.0-1.0) // Lagrange multipliers - this is how the context defaults do it: - m_context->lmin = m_context->qmin * FF_QP2LAMBDA; - m_context->lmax = m_context->qmax * FF_QP2LAMBDA; -+ av_opt_set_int(m_context, "lmin", m_context->qmin * FF_QP2LAMBDA, 0); -+ av_opt_set_int(m_context, "lmax", m_context->qmax * FF_QP2LAMBDA, 0); ++ av_opt_set_int(m_context->priv_data, "lmin", m_context->qmin * FF_QP2LAMBDA, 0); ++ av_opt_set_int(m_context->priv_data, "lmax", m_context->qmax * FF_QP2LAMBDA, 0); // YUV420P input m_inputFrame->linesize[0] = m_context->width; @@ -595,7 +595,7 @@ bool H263_RFC2190_EncoderContext::Init() m_context->opaque = this; // used to separate out packets from different encode threads av_opt_set_int(m_context->priv_data, "umv", 0, 0); - m_context->flags &= ~CODEC_FLAG_4MV; + m_context->flags &= ~AV_CODEC_FLAG_4MV; #if LIBAVCODEC_RTP_MODE m_context->flags &= ~CODEC_FLAG_H263P_AIC; #endif --- plugins/video/H.263-1998/rfc2429.cxx.orig +++ plugins/video/H.263-1998/rfc2429.cxx @@ -286,7 +286,7 @@ bool RFC2429Frame::GetPacket(RTPFrame & frame, unsigne unsigned char * RFC2429Frame::GetBuffer() { - memset (m_encodedFrame.ptr + m_encodedFrame.pos,0 , FF_INPUT_BUFFER_PADDING_SIZE); + memset (m_encodedFrame.ptr + m_encodedFrame.pos,0 , AV_INPUT_BUFFER_PADDING_SIZE); return (m_encodedFrame.ptr); } @@ -340,10 +340,10 @@ bool RFC2429Frame::AddPacket(const RTPFrame & packet) unsigned remBytes = packet.GetPayloadSize() - headerPLEN - (headerV ? 3 : 2); - if ((m_encodedFrame.pos + (headerP ? 2 : 0) + remBytes) > (m_maxFrameSize - FF_INPUT_BUFFER_PADDING_SIZE)) { + if ((m_encodedFrame.pos + (headerP ? 2 : 0) + remBytes) > (m_maxFrameSize - AV_INPUT_BUFFER_PADDING_SIZE)) { PTRACE(2, "H.263-RFC2429", "Trying to add " << remBytes << " bytes to frame at position " << m_encodedFrame.pos + (headerP ? 2 : 0) - << " bytes while maximum frame size is " << m_maxFrameSize << "-" << FF_INPUT_BUFFER_PADDING_SIZE << " bytes"); + << " bytes while maximum frame size is " << m_maxFrameSize << "-" << AV_INPUT_BUFFER_PADDING_SIZE << " bytes"); return false; } --- plugins/video/H.264/h264-x264.cxx.orig +++ plugins/video/H.264/h264-x264.cxx @@ -1076,9 +1076,9 @@ class MyDecoder : public PluginCodec m_context->workaround_bugs = FF_BUG_AUTODETECT; m_context->idct_algo = FF_IDCT_H264; m_context->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK; - m_context->flags2 = CODEC_FLAG2_DROP_FRAME_TIMECODE | + m_context->flags2 = AV_CODEC_FLAG2_DROP_FRAME_TIMECODE | CODEC_FLAG2_SKIP_RD | - CODEC_FLAG2_CHUNKS; + AV_CODEC_FLAG2_CHUNKS; if ((m_picture = FFMPEGLibraryInstance.AvcodecAllocFrame()) == NULL) return false; --- plugins/video/MPEG4-ffmpeg/mpeg4.cxx.orig +++ plugins/video/MPEG4-ffmpeg/mpeg4.cxx @@ -548,19 +548,19 @@ void MPEG4EncoderContext::SetStaticEncodingParams(){ // Reduce the difference in quantization between frames. m_avcontext->qblur = 0.3f; // default is tex^qComp; 1 is constant bitrate - m_avcontext->rc_eq = (char*) "1"; - //avcontext->rc_eq = "tex^qComp"; -+ av_opt_set(m_avcontext, "rc_eq", (char*) "1", 0); -+ //av_opt_set(m_avcontext, "rc_eq", "tex^qComp", 0); ++ av_opt_set(m_avcontext->priv_data, "rc_eq", (char*) "1", 0); ++ //av_opt_set(m_avcontext->priv_data, "rc_eq", "tex^qComp", 0); // These ones technically could be dynamic, I think m_avcontext->rc_min_rate = 0; // This is set to 0 in ffmpeg.c, the command-line utility. - m_avcontext->rc_initial_cplx = 0.0f; -+ av_opt_set_double(m_avcontext, "rc_init_cplx", 0.0f, 0); ++ av_opt_set_double(m_avcontext->priv_data, "rc_init_cplx", 0.0f, 0); // And this is set to 1. // It seems to affect how aggressively the library will raise and lower // quantization to keep bandwidth constant. Except it's in reference to // the "vbv buffer", not bits per second, so nobody really knows how // it works. - m_avcontext->rc_buffer_aggressivity = 1.0f; -+ av_opt_set_double(m_avcontext, "rc_buf_aggressivity", 1.0f, 0); ++ av_opt_set_double(m_avcontext->priv_data, "rc_buf_aggressivity", 1.0f, 0); // Ratecontrol buffer size, in bits. Usually 0.5-1 second worth. // 224 kbyte is what VLC uses, and it seems to fix the quantization pulse (at Level 5) @@ -594,11 +594,11 @@ void MPEG4EncoderContext::SetStaticEncodingParams(){ m_avcontext->flags |= CODEC_FLAG_4MV; // 4 motion vectors #else m_avcontext->max_b_frames=0; /*don't use b frames*/ - m_avcontext->flags|=CODEC_FLAG_AC_PRED; + m_avcontext->flags|=AV_CODEC_FLAG_AC_PRED; av_opt_set_int(m_avcontext->priv_data, "umv", 1, 0); /*c->flags|=CODEC_FLAG_QPEL;*/ /*don't enable this one: this forces profile_level to advanced simple profile */ - m_avcontext->flags|=CODEC_FLAG_4MV; - m_avcontext->flags|=CODEC_FLAG_LOOP_FILTER; + m_avcontext->flags|=AV_CODEC_FLAG_4MV; + m_avcontext->flags|=AV_CODEC_FLAG_LOOP_FILTER; av_opt_set_int(m_avcontext->priv_data, "structured_slices", 1, 0); #endif m_avcontext->opaque = this; // for use in RTP callback @@ -636,8 +636,8 @@ void MPEG4EncoderContext::SetDynamicEncodingParams(boo m_avcontext->qmax = std::min( m_avcontext->qmax, 31); // Lagrange multipliers - this is how the context defaults do it: - m_avcontext->lmin = m_avcontext->qmin * FF_QP2LAMBDA; - m_avcontext->lmax = m_avcontext->qmax * FF_QP2LAMBDA; -+ av_opt_set_int(m_avcontext, "lmin", m_avcontext->qmin * FF_QP2LAMBDA, 0); -+ av_opt_set_int(m_avcontext, "lmax", m_avcontext->qmax * FF_QP2LAMBDA, 0); ++ av_opt_set_int(m_avcontext->priv_data, "lmin", m_avcontext->qmin * FF_QP2LAMBDA, 0); ++ av_opt_set_int(m_avcontext->priv_data, "lmax", m_avcontext->qmax * FF_QP2LAMBDA, 0); // If framesize has changed or is not yet initialized, fix it up if((unsigned)m_avcontext->width != m_frameWidth || (unsigned)m_avcontext->height != m_frameHeight) { @@ -665,7 +665,7 @@ void MPEG4EncoderContext::ResizeEncodingFrame(bool res { delete[] m_rawFrameBuffer; } - m_rawFrameBuffer = new BYTE[m_rawFrameLen + FF_INPUT_BUFFER_PADDING_SIZE]; + m_rawFrameBuffer = new BYTE[m_rawFrameLen + AV_INPUT_BUFFER_PADDING_SIZE]; if (m_encFrameBuffer) { @@ -675,7 +675,7 @@ void MPEG4EncoderContext::ResizeEncodingFrame(bool res m_encFrameBuffer = new BYTE[m_encFrameLen]; // Clear the back padding - memset(m_rawFrameBuffer + m_rawFrameLen, 0, FF_INPUT_BUFFER_PADDING_SIZE); + memset(m_rawFrameBuffer + m_rawFrameLen, 0, AV_INPUT_BUFFER_PADDING_SIZE); const unsigned fsz = m_frameWidth * m_frameHeight; m_avpicture->data[0] = m_rawFrameBuffer; // luminance m_avpicture->data[1] = m_rawFrameBuffer + fsz; // first chroma channel @@ -1326,7 +1326,7 @@ void MPEG4DecoderContext::SetFrameHeight(int height) { // void MPEG4DecoderContext::SetStaticDecodingParams() { - m_avcontext->flags |= CODEC_FLAG_4MV; + m_avcontext->flags |= AV_CODEC_FLAG_4MV; av_opt_set_int(m_avcontext->priv_data, "data_partitionin", 1, 0); m_avcontext->workaround_bugs = 0; // no workaround for buggy implementations }