cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make net/h323plus work with brad's recent ffmpeg update.

Browse Source 
From brad, OK aja@
This commit is contained in:
edd 2011-12-30 17:39:06 +00:00
parent c117a8dd52
commit b13eccde6a
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/h323plus/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.9 2011/10/26 16:59:51 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.10 2011/12/30 17:39:06 edd Exp $
SHARED_ONLY= Yes
@ -7,6 +7,7 @@ COMMENT= H.323 video conferencing library
V= 1_23_0
DISTNAME= h323plus-v${V}
PKGNAME= h323plus-${V:S/_/./g}
REVISION= 0
CATEGORIES= net devel
SHARED_LIBS= h323 3.0 # 1.21.0
@ -27,7 +28,7 @@ WANTLIB += m pt pthread sasl2 speex ssl stdc++ x264
MASTER_SITES= ${HOMEPAGE}/source/download/
LIB_DEPENDS= devel/ptlib>=2.10.3 \
graphics/ffmpeg
graphics/ffmpeg>=20111126
WRKDIST= ${WRKDIR}/h323plus

21
net/h323plus/patches/patch-plugins_video_H_263-1998_h263-1998_cxx Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-plugins_video_H_263-1998_h263-1998_cxx,v 1.1 2011/12/30 17:39:06 edd Exp $
--- plugins/video/H.263-1998/h263-1998.cxx.orig Thu Dec 1 19:54:54 2011
+++ plugins/video/H.263-1998/h263-1998.cxx Thu Dec 1 19:55:15 2011
@@ -720,7 +720,7 @@ int H263_RFC2190_EncoderContext::EncodeFrames(const BY
_inputFrame->data[1] = _inputFrame->data[0] + size;
_inputFrame->data[2] = _inputFrame->data[1] + (size / 4);
- _inputFrame->pict_type = (flags && forceIFrame) ? FF_I_TYPE : 0;
+ _inputFrame->pict_type = (flags && forceIFrame) ? FF_I_TYPE : AV_PICTURE_TYPE_NONE;
currentMb = 0;
currentBytes = 0;
@@ -929,7 +929,7 @@ int H263_RFC2429_EncoderContext::EncodeFrames(const BY
_inputFrame->data[0] = _inputFrameBuffer + FF_INPUT_BUFFER_PADDING_SIZE;
_inputFrame->data[1] = _inputFrame->data[0] + size;
_inputFrame->data[2] = _inputFrame->data[1] + (size / 4);
- _inputFrame->pict_type = (flags && forceIFrame) ? FF_I_TYPE : 0;
+ _inputFrame->pict_type = (flags && forceIFrame) ? FF_I_TYPE : AV_PICTURE_TYPE_NONE;
_txH263PFrame->BeginNewFrame();
_txH263PFrame->SetTimestamp(srcRTP.GetTimestamp());