summaryrefslogtreecommitdiff
path: root/net/opal/files
diff options
context:
space:
mode:
Diffstat (limited to 'net/opal/files')
-rw-r--r--net/opal/files/patch-configurein63
-rw-r--r--net/opal/files/patch-include+h263codec.h19
-rw-r--r--net/opal/files/patch-include-ffh263codec.h12
-rw-r--r--net/opal/files/patch-include-h263codec.h19
-rw-r--r--net/opal/files/patch-src-ffh263codec.cxx19
-rw-r--r--net/opal/files/patch-src::h263codec.cxx20
6 files changed, 66 insertions, 86 deletions
diff --git a/net/opal/files/patch-configurein b/net/opal/files/patch-configurein
index edff8fef174b..28578a9c1175 100644
--- a/net/opal/files/patch-configurein
+++ b/net/opal/files/patch-configurein
@@ -1,50 +1,19 @@
-Index: configure.in
-diff -c configure.in.orig configure.in
-*** configure.in.orig Thu May 22 21:25:00 2003
---- configure.in Sun Nov 23 22:51:33 2003
+*** configure.in.orig Mon Jun 6 14:34:14 2005
+--- configure.in Mon Jun 6 14:41:03 2005
***************
-*** 73,85 ****
+*** 109,115 ****
+ if test "${H323_AVCODEC:-unset}" != "unset" ; then
+ AC_SUBST(H323_AVCODEC, 1)
+ AC_DEFINE(H323_AVCODEC, 1, "ffmpeg based avodec found")
+! AVCODECINCLUDEDIR=/usr/local/include/ffmpeg
+ AVCODECLIBDIR=/usr/local/lib
+ STDCCFLAGS="$STDCCFLAGS -I${AVCODECINCLUDEDIR}"
- dnl ########################################################################
- dnl get pwlib directory
-! if test "${PWLIBDIR:-unset}" == "unset" ; then
- PWLIBDIR=`ptlib-config --prefix`
- fi
-! if test "x$PWLIBDIR" == "x/usr" -o "x$PWLIBDIR" == "x/usr/"; then
- PWLIBDIR="/usr/share/pwlib/"
- fi
-! if test "xPWLIBDIR" == "x/usr/local" -o "x$PWLIBDIR" == "x/usr/"; then
- PWLIBDIR="/usr/local/share/pwlib/"
- fi
- echo "PWLib prefix set to.... $PWLIBDIR"
---- 73,85 ----
+--- 109,115 ----
+ if test "${H323_AVCODEC:-unset}" != "unset" ; then
+ AC_SUBST(H323_AVCODEC, 1)
+ AC_DEFINE(H323_AVCODEC, 1, "ffmpeg based avodec found")
+! AVCODECINCLUDEDIR=/usr/local/include
+ AVCODECLIBDIR=/usr/local/lib
+ STDCCFLAGS="$STDCCFLAGS -I${AVCODECINCLUDEDIR}"
- dnl ########################################################################
- dnl get pwlib directory
-! if test "${PWLIBDIR:-unset}" = "unset" ; then
- PWLIBDIR=`ptlib-config --prefix`
- fi
-! if test "x$PWLIBDIR" = "x/usr" -o "x$PWLIBDIR" = "x/usr/"; then
- PWLIBDIR="/usr/share/pwlib/"
- fi
-! if test "xPWLIBDIR" = "x/usr/local" -o "x$PWLIBDIR" = "x/usr/"; then
- PWLIBDIR="/usr/local/share/pwlib/"
- fi
- echo "PWLib prefix set to.... $PWLIBDIR"
-***************
-*** 96,102 ****
- else
- AC_CHECK_FILE(/usr/local/include/ffmpeg/avcodec.h, H323_AVCODEC=1)
- if test "${H323_AVCODEC:-unset}" != "unset" ; then
-! AVCODECINCLUDEDIR=/usr/local/include/ffmpeg
- AVCODECLIBDIR=/usr/local/lib
- fi
- fi
---- 96,102 ----
- else
- AC_CHECK_FILE(/usr/local/include/ffmpeg/avcodec.h, H323_AVCODEC=1)
- if test "${H323_AVCODEC:-unset}" != "unset" ; then
-! AVCODECINCLUDEDIR=/usr/local/include
- AVCODECLIBDIR=/usr/local/lib
- fi
- fi
diff --git a/net/opal/files/patch-include+h263codec.h b/net/opal/files/patch-include+h263codec.h
deleted file mode 100644
index 171efe102701..000000000000
--- a/net/opal/files/patch-include+h263codec.h
+++ /dev/null
@@ -1,19 +0,0 @@
---- include/h263codec.h.orig Sat Feb 19 11:29:15 2005
-+++ include/h263codec.h Sat Feb 19 11:38:52 2005
-@@ -92,6 +92,7 @@
- struct AVCodec;
- struct AVCodecContext;
- struct AVFrame;
-+struct AVCodecParserContext;
-
- ///////////////////////////////////////////////////////////////////////////////
-
-@@ -478,7 +479,7 @@
- send. Note that for every encode thread, this 1 method is called. Consequently,
- code is required to separate out packets from different encode threads.
- */
-- static void RtpCallback(void *data, int size, int packetNumber);
-+ static void RtpCallback(AVCodecContext *s, void *data, int size, int packetNumber);
-
- protected:
- BOOL Resize(int width, int height);
diff --git a/net/opal/files/patch-include-ffh263codec.h b/net/opal/files/patch-include-ffh263codec.h
new file mode 100644
index 000000000000..4329c3f7ef76
--- /dev/null
+++ b/net/opal/files/patch-include-ffh263codec.h
@@ -0,0 +1,12 @@
+*** include/ffh263codec.h.orig Mon Aug 4 00:03:16 2003
+--- include/ffh263codec.h Mon Jun 6 14:54:31 2005
+***************
+*** 96,101 ****
+--- 96,102 ----
+ struct AVCodec;
+ struct AVCodecContext;
+ struct AVFrame;
++ struct AVCodecParserContext;
+
+ ///////////////////////////////////////////////////////////////////////////////
+
diff --git a/net/opal/files/patch-include-h263codec.h b/net/opal/files/patch-include-h263codec.h
new file mode 100644
index 000000000000..de0bf299f3bd
--- /dev/null
+++ b/net/opal/files/patch-include-h263codec.h
@@ -0,0 +1,19 @@
+*** include/h263codec.h.orig Mon Aug 4 00:03:22 2003
+--- include/h263codec.h Mon Jun 6 14:57:16 2005
+***************
+*** 426,432 ****
+ send. Note that for every encode thread, this 1 method is called. Consequently,
+ code is required to separate out packets from different encode threads.
+ */
+! static void RtpCallback(void *data, int size, int packetNumber);
+
+ protected:
+ BOOL Resize(int width, int height);
+--- 426,432 ----
+ send. Note that for every encode thread, this 1 method is called. Consequently,
+ code is required to separate out packets from different encode threads.
+ */
+! static void RtpCallback(AVCodecContext *s, void *data, int size, int packet Number);
+
+ protected:
+ BOOL Resize(int width, int height);
diff --git a/net/opal/files/patch-src-ffh263codec.cxx b/net/opal/files/patch-src-ffh263codec.cxx
new file mode 100644
index 000000000000..3669cbe8779d
--- /dev/null
+++ b/net/opal/files/patch-src-ffh263codec.cxx
@@ -0,0 +1,19 @@
+*** src/ffh263codec.cxx.orig Fri Aug 8 01:52:14 2003
+--- src/ffh263codec.cxx Mon Jun 6 15:28:05 2005
+***************
+*** 140,146 ****
+ #define MSVC_OPENH323 1
+
+ extern "C" {
+! #include <avcodec.h>
+ };
+
+
+--- 140,146 ----
+ #define MSVC_OPENH323 1
+
+ extern "C" {
+! #include <ffmpeg/avcodec.h>
+ };
+
+
diff --git a/net/opal/files/patch-src::h263codec.cxx b/net/opal/files/patch-src::h263codec.cxx
deleted file mode 100644
index dee9c412d539..000000000000
--- a/net/opal/files/patch-src::h263codec.cxx
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/h263codec.cxx.orig Fri Jun 6 08:32:08 2003
-+++ src/h263codec.cxx Sat Feb 19 11:19:36 2005
-@@ -109,7 +109,7 @@
- #include "rtp.h"
-
- extern "C" {
--#include <avcodec.h>
-+#include <ffmpeg/avcodec.h>
- };
-
-
-@@ -836,7 +836,7 @@
- }
-
-
--void H323_H263Codec::RtpCallback(void *data, int size, int /*packetNumber*/)
-+void H323_H263Codec::RtpCallback(AVCodecContext* /*s*/, void *data, int size, int /*packetNumber*/)
- {
- encodedPackets.AppendH263Packet(data, size);
- }
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-30 15:59:41 +0000