Date: Sat, 30 Oct 2004 20:40:38 -0700 (PDT) From: "Michael C.Shultz" <ringworm@inbox.lv> To: FreeBSD-gnats-submit@FreeBSD.org Cc: lioux@FreeBSD.org Subject: ports/73331: Unbreak multimedia/mpeg4ip for FreeBSD > 5.0 Message-ID: <20041031034038.2C3552CE794@ringworm.mechee.com> Resent-Message-ID: <200410310350.i9V3oODr033689@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 73331
>Category: ports
>Synopsis: Unbreak multimedia/mpeg4ip for FreeBSD > 5.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Oct 31 03:50:24 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Michael C. Shultz
>Release: FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD ringworm.mechee.com 5.3-STABLE FreeBSD 5.3-STABLE #0: Sun Oct 24 05:04:58 PDT 2004 mike@ringworm.mechee.com:/usr/obj/usr/src/sys/RINGWORM i386
>Description:
multimedia/mpeg4ip marked broken for FreeBSD > 5.0
>How-To-Repeat:
try to build on FreeBSD > 5.0
>Fix:
This pr includes several patches that allows multimedia/mpeg4ip to build under FreeBSD > 5.0
**Note: In addition to several new patches, I renamed all of the originals**
renamed patches:
patch-gcc34 to patch-aa-gcc34
patch-include::mpeg4ip_byteswap.h to patch-ab-include::mpeg4ip_byteswap.h
patch-include::mpeg4ip_getopt.h to patch-ac-include::mpeg4ip_getopt.h
patch-lib::Makefile.in to patch-ad-lib::Makefile.in
patch-lib::xvid::bitstream::h263.h to patch-ae-lib::xvid::bitstream::h263.h
patch-mpeg4ip_config.h.in to patch-af-mpeg4ip_config.h.in
new patches:
patch-ba::configure.in patch-bcd-player::src::audio.h
patch-bb-lib::audio::mp3::MPEGaudio.h patch-bcd-player::src::audio_sdl.cpp
patch-bb-lib::mpeg2t::mpeg2_transport.h patch-bcd-player::src::codec::aa::aac.h
patch-bb-lib::xvid::divx4.c patch-bcd-player::src::codec::mp3::mp3if.h
patch-bb-lib::xvid::encoder.c patch-bcd-player::src::codec::wav::ourwav.h
patch-bb-lib::xvid::xvid.h patch-bcd-player::src::codec_plugin.h
patch-bca-player::plugin::audio::celp::celp.h patch-bcd-player::src::our_config_file.h
patch-bca-player::plugin::audio::raw::rawa.cpp patch-bcd-player::src::player_session.h
patch-bcb-player::plugin::video::xvid::ourxvid.cpp patch-bcd-player::src::rtp_bytestream.h
patch-bcb-player::plugin::video::xvid::xvid_file.cpp patch-bce-player::rtp::isma_audio::isma_rtp_plugin.h
patch-bcc-player::lib::audio::mp3::MPEGaction.h patch-bd-common::video::libmpeg32::video::slice.h
patch-bcc-player::lib::audio::mp3::MPEGaudio.h patch-be-msg_queue::msg_queue.h
patch-bcc-player::lib::audio::mp3::MPEGring.h patch-bf-server::util::xvidenc::Makefile.in
patch-bcc-player::lib::rtsp::rtsp_private.h patch-bf-server::util::xvidenc::xvidenc.c
patch-bcd-player::src::Makefile.in patch-bg-util::yuv::Makefile.in
--- mpeg4ip.diff begins here ---
diff -ruN mpeg4ip/Makefile mpeg4ip.NEW/Makefile
--- mpeg4ip/Makefile Sat Oct 30 20:08:29 2004
+++ mpeg4ip.NEW/Makefile Sat Oct 30 20:00:21 2004
@@ -7,6 +7,7 @@
PORTNAME= mpeg4ip
PORTVERSION= 1.0
+PORTREVISION= 1
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -33,6 +34,8 @@
DOC_FILES= COPYING README doc/MPEG4IP_Guide.pdf
PORTDOCS= COPYING MPEG4IP_Guide.pdf README
+USE_AUTOCONF_VER=253
+
MAN1= gmp4player.1 mp4creator.1 mp4encode.1 mp4live.1
MAN3= MP4.3 MP4AddAudioTrack.3 MP4AddHintTrack.3 MP4AddODTrack.3 \
MP4AddRtpESConfigurationPacket.3 MP4AddRtpHint.3 \
@@ -91,10 +94,6 @@
.include <bsd.port.pre.mk>
-.if ${OSVERSION} >= 502126
-#BROKEN= "Does not compile on FreeBSD >= 5.x"
-.endif
-
.if exists(${LOCALBASE}/include/systems.h)
CONFLICTS= faad*
.endif
@@ -109,33 +108,12 @@
's|<stdint.h>|<inttypes.h>|; \
s|<malloc.h>|<stdlib.h>|; \
s|<strstream.h>|<iostream>|'
-# replacing distfile's libs with ports' versions
-# CFLAGS safeness
- @${REINPLACE_CMD} -E -e 's|lib/SDL/sdl-config|${SDL_CONFIG}|; \
- s|^(SDL_LIBS=).+$$|\1"`${SDL_CONFIG} --libs`"|; \
- s|-Wmissing-declarations||' \
- ${CONFIGURE_WRKSRC}/configure
- @${FIND} ${WRKSRC} -type f -name "Makefile.in" | ${XARGS} \
- -n 10 ${REINPLACE_CMD} -E -e \
- 's|-I[^ ]+lib/SDL/include|-I${LOCALBASE}/include/SDL11|; \
- s|-O[0-3]|-O|; \
- s|\$$[^ ]+/lib/SDL/src/main/libSDLmain.a|${LOCALBASE}/lib/libSDLmain-1.1.a|'
- @${REINPLACE_CMD} -E -e \
- 's!SDL_(AudioDelayMsec|HasAudioDelayMsec).*;$$!0;!' \
- ${WRKSRC}/player/src/audio_sdl.cpp
-# do not install manm man pages
@${REINPLACE_CMD} -E \
-e 's|api.mpt||' \
-e 's|^(install-man.*)install-manm|\1|' \
${WRKSRC}/doc/mp4v2/Makefile.in
-# Disable xvid support - mpep4ip doesn't support xvid 1.0.x, but tries
-# to use it anyway.
- @${REINPLACE_CMD} -e 's|use_mpeg4ip_xvid=false|use_mpeg4ip_xvid=true|g' \
- -e 's|#define HAVE_XVID_H 1||g' \
- ${WRKSRC}/configure
.if ${ARCH} != "i386"
-# emms opcode should be noop in non-i386 non-MMX ARCH
@${ECHO_CMD} '#define EMMS()' \
>> ${WRKSRC}/lib/xvid/portab.h
.endif
@@ -156,6 +134,8 @@
${WRKSRC}/util/yuv/Makefile \
${WRKSRC}/util/iptv/Makefile
.endif
+
+USE_REINPLACE= yes
post-install:
.ifndef(NOPORTDOCS)
diff -ruN mpeg4ip/files/patch-aa-gcc34 mpeg4ip.NEW/files/patch-aa-gcc34
--- mpeg4ip/files/patch-aa-gcc34 Wed Dec 31 16:00:00 1969
+++ mpeg4ip.NEW/files/patch-aa-gcc34 Fri Oct 29 12:40:35 2004
@@ -0,0 +1,11 @@
+--- common/video/mpeg4-2000/idct/idct.hpp.orig Fri Jul 23 01:57:47 2004
++++ common/video/mpeg4-2000/idct/idct.hpp Fri Jul 23 02:02:41 2004
+@@ -22,7 +22,7 @@
+ #ifndef _INT_IDCT_
+ #define _INT_IDCT_ 1
+
+-
++#define BLOCK_SIZE 5
+ #define IDCT_BLOCK_SIZE 8
+ class idct{
+ public:
diff -ruN mpeg4ip/files/patch-ab-include::mpeg4ip_byteswap.h mpeg4ip.NEW/files/patch-ab-include::mpeg4ip_byteswap.h
--- mpeg4ip/files/patch-ab-include::mpeg4ip_byteswap.h Wed Dec 31 16:00:00 1969
+++ mpeg4ip.NEW/files/patch-ab-include::mpeg4ip_byteswap.h Fri Oct 29 12:40:35 2004
@@ -0,0 +1,26 @@
+--- include/mpeg4ip_byteswap.h.orig Wed Nov 13 16:44:43 2002
++++ include/mpeg4ip_byteswap.h Wed Nov 13 16:44:47 2002
+@@ -26,2 +26,6 @@
+
++#if (defined(__unix__) || defined(unix)) && !defined(USG)
++#include <sys/param.h>
++#endif
++
+ #if defined(WORDS_BIGENDIAN)
+@@ -51,2 +55,16 @@
+ #define B2N_64(x) x = swap64(x)
++
++#elif defined(__FreeBSD__) && __FreeBSD_version >= 470000
++#include <sys/endian.h>
++#define B2N_16(x) (be16toh(x))
++#define B2N_32(x) (be32toh(x))
++#define B2N_64(x) \
++ x = ((((x) & 0xff00000000000000) >> 56) | \
++ (((x) & 0x00ff000000000000) >> 40) | \
++ (((x) & 0x0000ff0000000000) >> 24) | \
++ (((x) & 0x000000ff00000000) >> 8) | \
++ (((x) & 0x00000000ff000000) << 8) | \
++ (((x) & 0x0000000000ff0000) << 24) | \
++ (((x) & 0x000000000000ff00) << 40) | \
++ (((x) & 0x00000000000000ff) << 56))
+
diff -ruN mpeg4ip/files/patch-ac-include::mpeg4ip_getopt.h mpeg4ip.NEW/files/patch-ac-include::mpeg4ip_getopt.h
--- mpeg4ip/files/patch-ac-include::mpeg4ip_getopt.h Wed Dec 31 16:00:00 1969
+++ mpeg4ip.NEW/files/patch-ac-include::mpeg4ip_getopt.h Fri Oct 29 12:40:35 2004
@@ -0,0 +1,12 @@
+--- include/mpeg4ip_getopt.h.orig Tue Oct 15 13:12:27 2002
++++ include/mpeg4ip_getopt.h Mon Feb 24 05:23:50 2003
+@@ -11,6 +11,9 @@
+ #endif
+
+ #ifdef HAVE_GETOPT_H
++#ifdef __FreeBSD__
++#define __GNU_LIBRARY__
++#endif
+ #include <getopt.h>
+ #endif
+
diff -ruN mpeg4ip/files/patch-ad-lib::Makefile.in mpeg4ip.NEW/files/patch-ad-lib::Makefile.in
--- mpeg4ip/files/patch-ad-lib::Makefile.in Wed Dec 31 16:00:00 1969
+++ mpeg4ip.NEW/files/patch-ad-lib::Makefile.in Fri Oct 29 12:40:35 2004
@@ -0,0 +1,11 @@
+--- lib/Makefile.in.orig Wed Jan 1 21:46:28 2003
++++ lib/Makefile.in Wed Jan 1 21:47:39 2003
+@@ -110,7 +110,7 @@
+ am__include = @am__include@
+ am__quote = @am__quote@
+ install_sh = @install_sh@
+-SUBDIRS = avi bitstream config_file fposrec gnu mp4 mp4v2 mp4av msg_queue rtp sdp SDL xvid mpeg2t SDL_VisualC
++SUBDIRS = avi bitstream config_file fposrec gnu mp4 mp4v2 mp4av msg_queue rtp sdp xvid mpeg2t
+ subdir = lib
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
diff -ruN mpeg4ip/files/patch-ae-lib::xvid::bitstream::h263.h mpeg4ip.NEW/files/patch-ae-lib::xvid::bitstream::h263.h
--- mpeg4ip/files/patch-ae-lib::xvid::bitstream::h263.h Wed Dec 31 16:00:00 1969
+++ mpeg4ip.NEW/files/patch-ae-lib::xvid::bitstream::h263.h Fri Oct 29 12:40:35 2004
@@ -0,0 +1,30 @@
+--- lib/xvid/bitstream/h263.h.orig Wed Nov 13 16:53:29 2002
++++ lib/xvid/bitstream/h263.h Wed Nov 13 16:55:31 2002
+@@ -25,6 +25,10 @@
+ /* #define FFMPEG_VERSION_INT 0x000405 */
+ /* #define FFMPEG_VERSION "0.4.5" */
+
++#if (defined(__unix__) || defined(unix)) && !defined(USG)
++#include <sys/param.h>
++#endif
++
+ #ifdef WIN32
+ #define CONFIG_WIN32
+ #endif
+@@ -69,11 +73,16 @@
+ #define DEBUG
+ #endif
+
++#if defined(__FreeBSD__) && __FreeBSD_version >= 470000
++#include <sys/endian.h>
++#define be2me_32(x) (be32toh(x))
++#else
+ // code from bits/byteswap.h (C) 1997, 1998 Free Software Foundation, Inc.
+ #define bswap_32(x) \
+ ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | \
+ (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24))
+ #define be2me_32(x) bswap_32(x)
++#endif
+
+ #define snprintf _snprintf
+
diff -ruN mpeg4ip/files/patch-af-mpeg4ip_config.h.in mpeg4ip.NEW/files/patch-af-mpeg4ip_config.h.in
--- mpeg4ip/files/patch-af-mpeg4ip_config.h.in Wed Dec 31 16:00:00 1969
+++ mpeg4ip.NEW/files/patch-af-mpeg4ip_config.h.in Fri Oct 29 12:40:35 2004
@@ -0,0 +1,24 @@
+--- mpeg4ip_config.h.in.orig Sun Apr 11 10:24:26 2004
++++ mpeg4ip_config.h.in Sun Apr 11 10:24:48 2004
+@@ -22,13 +22,10 @@
+ #undef HAVE_FPOS_T_POS
+
+ /* Define to 1 if you have the `getopt' function. */
+-#undef HAVE_GETOPT
+
+ /* Define to 1 if you have the <getopt.h> header file. */
+-#undef HAVE_GETOPT_H
+
+ /* Define to 1 if you have the `getopt_long' function. */
+-#undef HAVE_GETOPT_LONG
+
+ /* Define to 1 if you have the `getopt_long_only' function. */
+ #undef HAVE_GETOPT_LONG_ONLY
+@@ -58,7 +55,6 @@
+ #undef HAVE_IPv6
+
+ /* Define to 1 if you have the `gnugetopt' library (-lgnugetopt). */
+-#undef HAVE_LIBGNUGETOPT
+
+ /* Define to 1 if you have the `socket' library (-lsocket). */
+ #undef HAVE_LIBSOCKET
diff -ruN mpeg4ip/files/patch-ba::configure.in mpeg4ip.NEW/files/patch-ba::configure.in
--- mpeg4ip/files/patch-ba::configure.in Wed Dec 31 16:00:00 1969
+++ mpeg4ip.NEW/files/patch-ba::configure.in Fri Oct 29 19:13:26 2004
@@ -0,0 +1,29 @@
+--- configure.in Mon Dec 22 14:50:08 2003
++++ configure.in Fri Oct 29 16:27:52 2004
+@@ -11,8 +11,8 @@
+ AC_CONFIG_SUBDIRS(lib/rtp)
+
+ dnl Checks for programs.
+-AC_CHECK_FILE(lib/SDL/sdl-config,,
+- AC_MSG_ERROR([Configure for SDL needs to run first - either run bootstrap or run lib/SDL/configure]))
++#AC_CHECK_FILE(lib/SDL/sdl-config,,
++# AC_MSG_ERROR([Configure for SDL needs to run first - either run bootstrap or run lib/SDL/configure]))
+
+
+ AC_LIBTOOL_DLOPEN
+@@ -369,12 +369,12 @@
+ AM_CONDITIONAL(USE_MMX, test x$test_use_mmx = xtrue)
+
+ dnl Get SDL cflags and SDL libraries to include
+-SDL_LIBS="`sh lib/SDL/sdl-config --libs | sed 's,-L.* -lSDL,\$(top_builddir)/lib/SDL/src/libSDL.la,'`"
++SDL_LIBS=-lpthread `sh /usr/local/bin/sdl11-config --libs | sed 's,-L.* -lSDL,\/usr/local/lib/libSDL-1.1.so,'`
+ AC_SUBST(SDL_LIBS)
+
+ dnl
+-BILLS_CWARNINGS="-Wall -Werror -Wmissing-prototypes -Wmissing-declarations -Wno-char-subscripts -Wno-unknown-pragmas"
+-BILLS_CPPWARNINGS="-Wall -Werror -Wmissing-prototypes -Wno-char-subscripts -Woverloaded-virtual -Wno-unknown-pragmas -Wno-deprecated"
++BILLS_CWARNINGS="-Wall -Wmissing-declarations -Wno-char-subscripts -Wno-unknown-pragmas"
++BILLS_CPPWARNINGS="-Wall -Wno-char-subscripts -Woverloaded-virtual -Wno-unknown-pragmas -Wno-deprecated"
+ AC_SUBST(BILLS_CWARNINGS)
+ AC_SUBST(BILLS_CPPWARNINGS)
+
diff -ruN mpeg4ip/files/patch-bb-lib::audio::mp3::MPEGaudio.h mpeg4ip.NEW/files/patch-bb-lib::audio::mp3::MPEGaudio.h
--- mpeg4ip/files/patch-bb-lib::audio::mp3::MPEGaudio.h Wed Dec 31 16:00:00 1969
+++ mpeg4ip.NEW/files/patch-bb-lib::audio::mp3::MPEGaudio.h Fri Oct 29 13:55:53 2004
@@ -0,0 +1,12 @@
+--- player/lib/audio/mp3/MPEGaudio.h Fri Oct 29 13:54:03 2004
++++ player/lib/audio/mp3/MPEGaudio.h Fri Oct 29 13:50:39 2004
+@@ -21,7 +21,8 @@
+
+ #ifndef _MPEGAUDIO_H_
+ #define _MPEGAUDIO_H_
+-#include "mpeg4ip.h"
++/*#include "mpeg4ip.h" */
++#include "../../../../include/mpeg4ip.h"
+
+ /* This improves the performance of the audio player by quite a bit */
+ #define THREADED_AUDIO
diff -ruN mpeg4ip/files/patch-bb-lib::mpeg2t::mpeg2_transport.h mpeg4ip.NEW/files/patch-bb-lib::mpeg2t::mpeg2_transport.h
--- mpeg4ip/files/patch-bb-lib::mpeg2t::mpeg2_transport.h Wed Dec 31 16:00:00 1969
+++ mpeg4ip.NEW/files/patch-bb-lib::mpeg2t::mpeg2_transport.h Sat Oct 30 11:38:25 2004
@@ -0,0 +1,13 @@
+--- lib/mpeg2t/mpeg2_transport.h Sat Oct 30 11:36:14 2004
++++ lib/mpeg2t/mpeg2_transport.h Sat Oct 30 11:35:54 2004
+@@ -24,8 +24,8 @@
+ #ifndef __MPEG2_TRANSPORT_H__
+ #define __MPEG2_TRANSPORT_H__
+
+-#include <SDL.h>
+-#include <SDL_thread.h>
++#include <SDL11/SDL.h>
++#include <SDL11/SDL_thread.h>
+
+ #define MPEG2T_SYNC_BYTE 0x47
+
diff -ruN mpeg4ip/files/patch-bb-lib::xvid::divx4.c mpeg4ip.NEW/files/patch-bb-lib::xvid::divx4.c
--- mpeg4ip/files/patch-bb-lib::xvid::divx4.c Wed Dec 31 16:00:00 1969
+++ mpeg4ip.NEW/files/patch-bb-lib::xvid::divx4.c Fri Oct 29 23:22:51 2004
@@ -0,0 +1,18 @@
+--- lib/xvid/divx4.c Fri Oct 29 23:21:06 2004
++++ lib/xvid/divx4.c Fri Oct 29 23:20:32 2004
+@@ -347,8 +347,13 @@
+ xparam.fincr = FRAMERATE_INCR;
+ xparam.fbase = (int)(FRAMERATE_INCR * eparam->framerate);
+ }
+- xparam.bitrate = eparam->bitrate;
+- xparam.rc_buffersize = 16;
++/* see http://www.xvid.org/modules.php?op=modload&name=Sections&file=index&req=viewarticle&artid=3 */
++/* xparam.bitrate = eparam->bitrate; */
++ xparam.rc_bitrate = eparam->bitrate;
++
++/* see http://www.xvid.org/modules.php?op=modload&name=Sections&file=index&req=viewarticle&artid=3 */
++/* xparam.rc_bufferrc_buffersize = 16; */
++ xparam.rc_buffer = 16;
+ xparam.min_quantizer = eparam->min_quantizer;
+ xparam.max_quantizer = eparam->max_quantizer;
+ xparam.max_key_interval = eparam->max_key_interval;
diff -ruN mpeg4ip/files/patch-bb-lib::xvid::encoder.c mpeg4ip.NEW/files/patch-bb-lib::xvid::encoder.c
--- mpeg4ip/files/patch-bb-lib::xvid::encoder.c Wed Dec 31 16:00:00 1969
+++ mpeg4ip.NEW/files/patch-bb-lib::xvid::encoder.c Sat Oct 30 00:07:18 2004
@@ -0,0 +1,39 @@
+--- lib/xvid/encoder.c Sat Oct 30 00:05:00 2004
++++ lib/xvid/encoder.c Sat Oct 30 00:04:26 2004
+@@ -84,11 +84,11 @@
+ pParam->fincr = (int)(pParam->fincr / div);
+ }
+
+- if (pParam->bitrate <= 0)
+- pParam->bitrate = 900000;
++ if (pParam->rc_bitrate <= 0)
++ pParam->rc_bitrate = 900000;
+
+- if (pParam->rc_buffersize <= 0)
+- pParam->rc_buffersize = 16;
++ if (pParam->rc_buffer <= 0)
++ pParam->rc_buffer = 16;
+
+ if ((pParam->min_quantizer <= 0) || (pParam->min_quantizer > 31))
+ pParam->min_quantizer = 1;
+@@ -132,7 +132,7 @@
+
+ pEnc->mbParam.quant = 4;
+
+- pEnc->bitrate = pParam->bitrate;
++ pEnc->bitrate = pParam->rc_bitrate;
+
+ pEnc->iFrameNum = 0;
+ pEnc->iMaxKeyInterval = pParam->max_key_interval;
+@@ -186,9 +186,9 @@
+
+ pParam->handle = (void *)pEnc;
+
+- if (pParam->bitrate)
++ if (pParam->rc_bitrate)
+ {
+- RateControlInit(pParam->bitrate, pParam->rc_buffersize, pParam->fbase * 1000 / pParam->fincr,
++ RateControlInit(pParam->rc_bitrate, pParam->rc_buffer, pParam->fbase * 1000 / pParam->fincr,
+ pParam->max_quantizer, pParam->min_quantizer);
+ }
+
diff -ruN mpeg4ip/files/patch-bb-lib::xvid::xvid.h mpeg4ip.NEW/files/patch-bb-lib::xvid::xvid.h
--- mpeg4ip/files/patch-bb-lib::xvid::xvid.h Wed Dec 31 16:00:00 1969
+++ mpeg4ip.NEW/files/patch-bb-lib::xvid::xvid.h Fri Oct 29 23:44:39 2004
@@ -0,0 +1,42 @@
+--- lib/xvid/xvid.h Fri Oct 29 23:42:48 2004
++++ lib/xvid/xvid.h Fri Oct 29 23:41:56 2004
+@@ -147,7 +147,7 @@
+ #define PMV_OVERLAPPING8 0x40000000 /* overlapping ME, not implemented */
+ #define PMV_USESQUARES8 0x80000000
+
+-
++/*
+ typedef struct
+ {
+ int width, height;
+@@ -162,8 +162,29 @@
+ void * handle; // [out] encoder instance handle
+
+ } XVID_ENC_PARAM;
++*/
++/*********************************************************************************************/
++/*http://www.xvid.org/modules.php?op=modload&name=Sections&file=index&req=viewarticle&artid=3*/
++/* changed this to match more or less the above reference */
++typedef struct
++{
++ int width, height; // [in]
++ int fincr, fbase; // [in]
++/*********************************************************************************************/
++/*http://www.xvid.org/modules.php?op=modload&name=Sections&file=index&req=viewarticle&artid=3*/
++/* This is not IAW the above reference, needed by mpeg4ip-1.0/lib/xvid/encoder.c */
++ int dont_simplify_fincr;
++/*********************************************************************************************/
++ int rc_bitrate; // [in]
++ int rc_reaction_delay_factor; // [in]
++ int rc_averaging_period; // [in]
++ int rc_buffer; // [in]
++ int max_quantizer; // [in]
++ int min_quantizer; // [in]
++ int max_key_interval; // [in]
+
+-
++ void *handle; // [out]
++} XVID_ENC_PARAM;
+ typedef struct
+ {
+ int x;
diff -ruN mpeg4ip/files/patch-bca-player::plugin::audio::celp::celp.h mpeg4ip.NEW/files/patch-bca-player::plugin::audio::celp::celp.h
--- mpeg4ip/files/patch-bca-player::plugin::audio::celp::celp.h Wed Dec 31 16:00:00 1969
+++ mpeg4ip.NEW/files/patch-bca-player::plugin::audio::celp::celp.h Sat Oct 30 14:23:25 2004
@@ -0,0 +1,11 @@
+--- player/plugin/audio/celp/celp.h Sat Oct 30 14:22:00 2004
++++ player/plugin/audio/celp/celp.h Sat Oct 30 14:21:54 2004
+@@ -30,7 +30,7 @@
+ #include "include/austream.h"
+
+ #include "bitstream.h"
+-#include <SDL.h>
++#include <SDL11/SDL.h>
+ #include "codec_plugin.h"
+
+ typedef struct celp_codec_t {
diff -ruN mpeg4ip/files/patch-bca-player::plugin::audio::raw::rawa.cpp mpeg4ip.NEW/files/patch-bca-player::plugin::audio::raw::rawa.cpp
--- mpeg4ip/files/patch-bca-player::plugin::audio::raw::rawa.cpp Wed Dec 31 16:00:00 1969
+++ mpeg4ip.NEW/files/patch-bca-player::plugin::audio::raw::rawa.cpp Sat Oct 30 14:00:01 2004
@@ -0,0 +1,11 @@
+--- player/plugin/audio/raw/rawa.cpp Sat Oct 30 13:58:26 2004
++++ player/plugin/audio/raw/rawa.cpp Sat Oct 30 13:58:18 2004
+@@ -20,7 +20,7 @@
+ */
+ #include "rawa.h"
+ #include <mp4v2/mp4.h>
+-#include <SDL.h>
++#include <SDL11/SDL.h>
+ #define LOGIT rawa->m_vft->log_msg
+ /*
+ * Create raw audio structure
diff -ruN mpeg4ip/files/patch-bcb-player::plugin::video::xvid::ourxvid.cpp mpeg4ip.NEW/files/patch-bcb-player::plugin::video::xvid::ourxvid.cpp
--- mpeg4ip/files/patch-bcb-player::plugin::video::xvid::ourxvid.cpp Wed Dec 31 16:00:00 1969
+++ mpeg4ip.NEW/files/patch-bcb-player::plugin::video::xvid::ourxvid.cpp Fri Oct 29 17:17:10 2004
@@ -0,0 +1,11 @@
+--- player/plugin/video/xvid/ourxvid.cpp Fri Oct 29 17:14:21 2004
++++ player/plugin/video/xvid/ourxvid.cpp Fri Oct 29 17:14:00 2004
+@@ -27,7 +27,7 @@
+ #include <mp4util/mpeg4_sdp.h>
+ #include <gnu/strcasestr.h>
+ #include <mp4v2/mp4.h>
+-#include <xvid.h>
++#include <xvid/xvid.h>
+ #include <mp4av/mp4av.h>
+
+ #define xvid_message (xvid->m_vft->log_msg)
diff -ruN mpeg4ip/files/patch-bcb-player::plugin::video::xvid::xvid_file.cpp mpeg4ip.NEW/files/patch-bcb-player::plugin::video::xvid::xvid_file.cpp
--- mpeg4ip/files/patch-bcb-player::plugin::video::xvid::xvid_file.cpp Wed Dec 31 16:00:00 1969
+++ mpeg4ip.NEW/files/patch-bcb-player::plugin::video::xvid::xvid_file.cpp Fri Oct 29 17:41:30 2004
@@ -0,0 +1,13 @@
+--- player/plugin/video/xvid/xvid_file.cpp Fri Oct 29 17:39:44 2004
++++ player/plugin/video/xvid/xvid_file.cpp Fri Oct 29 17:39:26 2004
+@@ -23,8 +23,8 @@
+ * Read a raw file for xvid.
+ */
+ #include "ourxvid.h"
+-#include "xvid.h"
+-#include <mp4av.h>
++#include <xvid/xvid.h>
++#include <mp4av/mp4av.h>
+ //#include "divx4.h"
+
+ /*
diff -ruN mpeg4ip/files/patch-bcc-player::lib::audio::mp3::MPEGaction.h mpeg4ip.NEW/files/patch-bcc-player::lib::audio::mp3::MPEGaction.h
--- mpeg4ip/files/patch-bcc-player::lib::audio::mp3::MPEGaction.h Wed Dec 31 16:00:00 1969
+++ mpeg4ip.NEW/files/patch-bcc-player::lib::audio::mp3::MPEGaction.h Sat Oct 30 13:30:40 2004
@@ -0,0 +1,11 @@
+--- player/lib/audio/mp3/MPEGaction.h Sat Oct 30 13:29:41 2004
++++ player/lib/audio/mp3/MPEGaction.h Sat Oct 30 13:29:33 2004
+@@ -22,7 +22,7 @@
+ #ifndef _MPEGACTION_H_
+ #define _MPEGACTION_H_
+
+-#include "SDL.h"
++#include <SDL11/SDL.h>
+ #include "MPEGfilter.h"
+
+ typedef enum {
diff -ruN mpeg4ip/files/patch-bcc-player::lib::audio::mp3::MPEGaudio.h mpeg4ip.NEW/files/patch-bcc-player::lib::audio::mp3::MPEGaudio.h
--- mpeg4ip/files/patch-bcc-player::lib::audio::mp3::MPEGaudio.h Wed Dec 31 16:00:00 1969
+++ mpeg4ip.NEW/files/patch-bcc-player::lib::audio::mp3::MPEGaudio.h Sat Oct 30 13:28:55 2004
@@ -0,0 +1,11 @@
+--- player/lib/audio/mp3/MPEGaudio.h Sat Oct 30 13:26:53 2004
++++ player/lib/audio/mp3/MPEGaudio.h Sat Oct 30 13:26:42 2004
+@@ -27,7 +27,7 @@
+ /* This improves the performance of the audio player by quite a bit */
+ #define THREADED_AUDIO
+
+-#include "SDL.h"
++#include <SDL11/SDL.h>
+ #include "MPEGerror.h"
+ #include "MPEGaction.h"
+
diff -ruN mpeg4ip/files/patch-bcc-player::lib::audio::mp3::MPEGring.h mpeg4ip.NEW/files/patch-bcc-player::lib::audio::mp3::MPEGring.h
--- mpeg4ip/files/patch-bcc-player::lib::audio::mp3::MPEGring.h Wed Dec 31 16:00:00 1969
+++ mpeg4ip.NEW/files/patch-bcc-player::lib::audio::mp3::MPEGring.h Sat Oct 30 13:32:05 2004
@@ -0,0 +1,13 @@
+--- player/lib/audio/mp3/MPEGring.h Sat Oct 30 13:31:25 2004
++++ player/lib/audio/mp3/MPEGring.h Sat Oct 30 13:31:14 2004
+@@ -24,8 +24,8 @@
+ #ifndef _MPEGRING_H
+ #define _MPEGRING_H
+
+-#include "SDL_types.h"
+-#include "SDL_thread.h"
++#include <SDL11/SDL_types.h>
++#include <SDL11/SDL_thread.h>
+
+ class MPEG_ring {
+ public:
diff -ruN mpeg4ip/files/patch-bcc-player::lib::rtsp::rtsp_private.h mpeg4ip.NEW/files/patch-bcc-player::lib::rtsp::rtsp_private.h
--- mpeg4ip/files/patch-bcc-player::lib::rtsp::rtsp_private.h Wed Dec 31 16:00:00 1969
+++ mpeg4ip.NEW/files/patch-bcc-player::lib::rtsp::rtsp_private.h Sat Oct 30 13:01:47 2004
@@ -0,0 +1,13 @@
+--- player/lib/rtsp/rtsp_private.h Sat Oct 30 13:00:01 2004
++++ player/lib/rtsp/rtsp_private.h Sat Oct 30 12:59:55 2004
+@@ -20,8 +20,8 @@
+ */
+ #include "rtsp_client.h"
+ #include "rtsp_thread_ipc.h"
+-#include <SDL.h>
+-#include <SDL_thread.h>
++#include <SDL11/SDL.h>
++#include <SDL11/SDL_thread.h>
+
+ #ifndef TRUE
+ #define TRUE 1
diff -ruN mpeg4ip/files/patch-bcd-player::src::Makefile.in mpeg4ip.NEW/files/patch-bcd-player::src::Makefile.in
--- mpeg4ip/files/patch-bcd-player::src::Makefile.in Wed Dec 31 16:00:00 1969
+++ mpeg4ip.NEW/files/patch-bcd-player::src::Makefile.in Fri Oct 29 20:06:25 2004
@@ -0,0 +1,80 @@
+*** player/src/Makefile.in Fri Oct 29 20:04:24 2004
+--- mpeg4ip-1.0/player/src/Makefile.in Fri Oct 29 20:00:37 2004
+***************
+*** 242,248 ****
+ gui_xpm.h
+
+
+! INCLUDES = -I. -I$(top_srcdir)/common/video/mpeg4 -I./codec -I./codec/mpeg4 -I../lib -I../lib/audio -I$(top_srcdir)/lib/SDL/include -I$(top_srcdir)/lib/mp4 -I$(top_srcdir)/lib/mp4v2 @ISMACRYPINC@ -I$(top_srcdir)/include -I$(top_srcdir)/include -I$(top_srcdir)/lib/avi -I$(top_srcdir)/lib -I$(top_srcdir)/common/video/libmpeg32 -I$(top_srcdir)/lib/sdp @GLIB_CFLAGS@ @GTK_CFLAGS@ @X_CFLAGS@
+
+ AM_CFLAGS = -D_REENTRANT @BILLS_CWARNINGS@ -DPLAYER_PLUGIN_DIR=\"@PLAYER_PLUGIN_DIR@\"
+
+--- 242,248 ----
+ gui_xpm.h
+
+
+! INCLUDES = -I. -I$(top_srcdir)/common/video/mpeg4 -I./codec -I./codec/mpeg4 -I../lib -I../lib/audio -I/usr/local/include/SDL11 -I$(top_srcdir)/lib/mp4 -I$(top_srcdir)/lib/mp4v2 @ISMACRYPINC@ -I$(top_srcdir)/include -I$(top_srcdir)/include -I$(top_srcdir)/lib/avi -I$(top_srcdir)/lib -I$(top_srcdir)/common/video/libmpeg32 -I$(top_srcdir)/lib/sdp @GLIB_CFLAGS@ @GTK_CFLAGS@ @X_CFLAGS@
+
+ AM_CFLAGS = -D_REENTRANT @BILLS_CWARNINGS@ -DPLAYER_PLUGIN_DIR=\"@PLAYER_PLUGIN_DIR@\"
+
+***************
+*** 269,282 ****
+
+
+ mp4player_LDADD = \
+! -lm \
+ libmp4player.la \
+ libmp4syncbase.la \
+ libmp4syncsdl.la \
+ libmp4syncbase.la \
+ libmp4playerutils.la \
+! @SDL_LIBS@ \
+! $(top_builddir)/lib/SDL/src/main/libSDLmain.a
+
+
+ gmp4player_LDADD = $(mp4player_LDADD) \
+--- 269,283 ----
+
+
+ mp4player_LDADD = \
+! -lm -lpthread \
+ libmp4player.la \
+ libmp4syncbase.la \
+ libmp4syncsdl.la \
+ libmp4syncbase.la \
+ libmp4playerutils.la \
+! /usr/local/lib/libSDL-1.1.so \
+! /usr/lib/libpthread.so \
+! /usr/local/lib/libSDLmain-1.1.a
+
+
+ gmp4player_LDADD = $(mp4player_LDADD) \
+***************
+*** 347,359 ****
+ gmp4player_OBJECTS = $(am_gmp4player_OBJECTS)
+ gmp4player_DEPENDENCIES = libmp4player.la libmp4syncbase.la \
+ libmp4syncsdl.la libmp4syncbase.la libmp4playerutils.la \
+! $(top_builddir)/lib/SDL/src/main/libSDLmain.a
+ gmp4player_LDFLAGS =
+ am_mp4player_OBJECTS = main.$(OBJEXT)
+ mp4player_OBJECTS = $(am_mp4player_OBJECTS)
+ mp4player_DEPENDENCIES = libmp4player.la libmp4syncbase.la \
+ libmp4syncsdl.la libmp4syncbase.la libmp4playerutils.la \
+! $(top_builddir)/lib/SDL/src/main/libSDLmain.a
+ mp4player_LDFLAGS =
+
+ DEFS = @DEFS@
+--- 348,360 ----
+ gmp4player_OBJECTS = $(am_gmp4player_OBJECTS)
+ gmp4player_DEPENDENCIES = libmp4player.la libmp4syncbase.la \
+ libmp4syncsdl.la libmp4syncbase.la libmp4playerutils.la \
+! /usr/local/lib/libSDLmain-1.1.a
+ gmp4player_LDFLAGS =
+ am_mp4player_OBJECTS = main.$(OBJEXT)
+ mp4player_OBJECTS = $(am_mp4player_OBJECTS)
+ mp4player_DEPENDENCIES = libmp4player.la libmp4syncbase.la \
+ libmp4syncsdl.la libmp4syncbase.la libmp4playerutils.la \
+! /usr/local/lib/libSDLmain-1.1.a
+ mp4player_LDFLAGS =
+
+ DEFS = @DEFS@
diff -ruN mpeg4ip/files/patch-bcd-player::src::audio.h mpeg4ip.NEW/files/patch-bcd-player::src::audio.h
--- mpeg4ip/files/patch-bcd-player::src::audio.h Wed Dec 31 16:00:00 1969
+++ mpeg4ip.NEW/files/patch-bcd-player::src::audio.h Sat Oct 30 16:28:04 2004
@@ -0,0 +1,11 @@
+--- player/src/audio.h Sat Oct 30 16:27:38 2004
++++ player/src/audio.h Sat Oct 30 16:27:24 2004
+@@ -28,7 +28,7 @@
+ #define __AUDIO_H__ 1
+
+ #include "codec_plugin.h"
+-#include <SDL.h>
++#include <SDL11/SDL.h>
+
+ #define DECODE_BUFFERS_MAX 32
+
diff -ruN mpeg4ip/files/patch-bcd-player::src::audio_sdl.cpp mpeg4ip.NEW/files/patch-bcd-player::src::audio_sdl.cpp
--- mpeg4ip/files/patch-bcd-player::src::audio_sdl.cpp Wed Dec 31 16:00:00 1969
+++ mpeg4ip.NEW/files/patch-bcd-player::src::audio_sdl.cpp Sat Oct 30 19:12:46 2004
@@ -0,0 +1,63 @@
+--- player/src/audio_sdl.cpp Sat Oct 30 19:11:42 2004
++++ player/src/audio_sdl.cpp Sat Oct 30 19:10:08 2004
+@@ -24,10 +24,10 @@
+ */
+ #include <stdlib.h>
+ #include <string.h>
+-#include "player_session.h"
+-#include "audio_sdl.h"
+-#include "player_util.h"
+-#include <SDL_thread.h>
++#include "player_session.h" // ??
++#include "audio_sdl.h" // ok
++#include "player_util.h" // ok
++#include <SDL11/SDL_thread.h>
+ #include "our_config_file.h"
+ //#define DEBUG_SYNC 1
+ //#define DEBUG_SYNC_CHANGES 1
+@@ -506,7 +506,11 @@
+ audio_message(LOG_DEBUG, "convert buffer size is %d", m_obtained.size);
+ }
+ m_audio_initialized = 1;
++/*
++SDL_HasAudioDelayMsec doesn't seem to exist in any header file????
+ m_use_SDL_delay = SDL_HasAudioDelayMsec();
++*/
++ m_use_SDL_delay = 0;
+ if (m_use_SDL_delay)
+ audio_message(LOG_NOTICE, "Using delay measurement from SDL");
+ } else {
+@@ -538,11 +542,16 @@
+ if (m_audio_paused && m_buffer_filled[m_resync_buffer]) {
+ // Calculate the current time based on the latency
+ SDL_LockAudio();
++/* SDL_HasAudioDelayMsec doesn't seem to exist in any header file????
++
+ if (m_use_SDL_delay) {
+ current_time +=SDL_AudioDelayMsec();
+ } else {
++*/
+ current_time += m_buffer_latency;
++/*
+ }
++*/
+ uint64_t cmptime;
+ int freed = 0;
+ // Compare with times in buffer - we may need to skip if we fell
+@@ -612,6 +621,7 @@
+ }
+
+ m_play_time = m_psptr->get_current_time();
++/* SDL_HasAudioDelayMsec doesn't seem to exist in any header file????
+ if (m_use_SDL_delay != 0) {
+ delay = SDL_AudioDelayMsec();
+ if (delay < 0) delay = 0;
+@@ -619,7 +629,7 @@
+ audio_message(LOG_DEBUG, "Audio delay is %d "U64, delay, m_play_time);
+ #endif
+ }
+-
++*/
+ if ((m_first_time == 0) &&
+ (m_use_SDL_delay == 0)) {
+ /*
diff -ruN mpeg4ip/files/patch-bcd-player::src::codec::aa::aac.h mpeg4ip.NEW/files/patch-bcd-player::src::codec::aa::aac.h
--- mpeg4ip/files/patch-bcd-player::src::codec::aa::aac.h Wed Dec 31 16:00:00 1969
+++ mpeg4ip.NEW/files/patch-bcd-player::src::codec::aa::aac.h Sat Oct 30 15:15:53 2004
@@ -0,0 +1,11 @@
+--- player/src/codec/aa/aac.h Sat Oct 30 15:13:26 2004
++++ player/src/codec/aa/aac.h Sat Oct 30 15:13:21 2004
+@@ -26,7 +26,7 @@
+ #define __AA_H__ 1
+ #include "faad/all.h"
+ #include <faad/bits.h>
+-#include <SDL.h>
++#include <SDL11/SDL.h>
+ #include "codec_plugin.h"
+
+ typedef struct aac_codec_t {
diff -ruN mpeg4ip/files/patch-bcd-player::src::codec::mp3::mp3if.h mpeg4ip.NEW/files/patch-bcd-player::src::codec::mp3::mp3if.h
--- mpeg4ip/files/patch-bcd-player::src::codec::mp3::mp3if.h Wed Dec 31 16:00:00 1969
+++ mpeg4ip.NEW/files/patch-bcd-player::src::codec::mp3::mp3if.h Sat Oct 30 15:44:59 2004
@@ -0,0 +1,11 @@
+--- player/src/codec/mp3/mp3if.h Sat Oct 30 15:43:28 2004
++++ player/src/codec/mp3/mp3if.h Sat Oct 30 15:43:21 2004
+@@ -4,7 +4,7 @@
+
+ #include "mpeg4ip.h"
+ #include <mp3/MPEGaudio.h>
+-#include <SDL.h>
++#include <SDL11/SDL.h>
+ #include "codec_plugin.h"
+ #include <fposrec/fposrec.h>
+
diff -ruN mpeg4ip/files/patch-bcd-player::src::codec::wav::ourwav.h mpeg4ip.NEW/files/patch-bcd-player::src::codec::wav::ourwav.h
--- mpeg4ip/files/patch-bcd-player::src::codec::wav::ourwav.h Wed Dec 31 16:00:00 1969
+++ mpeg4ip.NEW/files/patch-bcd-player::src::codec::wav::ourwav.h Sat Oct 30 15:52:53 2004
@@ -0,0 +1,11 @@
+--- player/src/codec/wav/ourwav.h Sat Oct 30 15:51:34 2004
++++ player/src/codec/wav/ourwav.h Sat Oct 30 15:51:25 2004
+@@ -24,7 +24,7 @@
+
+ #ifndef __OURWAV_H__
+ #define __OURWAV_H__ 1
+-#include <SDL.h>
++#include <SDL11/SDL.h>
+ #include "codec_plugin.h"
+
+ #define m_vft c.v.audio_vft
diff -ruN mpeg4ip/files/patch-bcd-player::src::codec_plugin.h mpeg4ip.NEW/files/patch-bcd-player::src::codec_plugin.h
--- mpeg4ip/files/patch-bcd-player::src::codec_plugin.h Wed Dec 31 16:00:00 1969
+++ mpeg4ip.NEW/files/patch-bcd-player::src::codec_plugin.h Sat Oct 30 16:30:11 2004
@@ -0,0 +1,13 @@
+--- player/src/codec_plugin.h Sat Oct 30 16:29:07 2004
++++ player/src/codec_plugin.h Sat Oct 30 16:29:00 2004
+@@ -24,8 +24,8 @@
+ #ifndef __CODEC_PLUGIN_H__
+ #define __CODEC_PLUGIN_H__ 1
+
+-#include <mpeg4ip.h>
+-#include <sdp.h>
++#include "../../include/mpeg4ip.h"
++#include "../../lib/sdp/sdp.h"
+
+ #define PLUGIN_VERSION "0.7"
+ /***************************************************************************
diff -ruN mpeg4ip/files/patch-bcd-player::src::our_config_file.h mpeg4ip.NEW/files/patch-bcd-player::src::our_config_file.h
--- mpeg4ip/files/patch-bcd-player::src::our_config_file.h Wed Dec 31 16:00:00 1969
+++ mpeg4ip.NEW/files/patch-bcd-player::src::our_config_file.h Sat Oct 30 16:21:20 2004
@@ -0,0 +1,12 @@
+--- player/src/our_config_file.h Sat Oct 30 16:19:43 2004
++++ player/src/our_config_file.h Sat Oct 30 16:19:28 2004
+@@ -24,7 +24,8 @@
+ #ifndef __OUR_CONFIG_FILE_H__
+ #define __OUR_CONFIG_FILE_H__ 1
+
+-#include <config_file/config_file.h>
++/* #include <config_file/config_file.h> */
++#include "../../lib/config_file/config_file.h"
+ #define CONFIG_USE_MPEG4_ISO_ONLY 0
+ #define CONFIG_PREV_FILE_0 1
+ #define CONFIG_PREV_FILE_1 2
diff -ruN mpeg4ip/files/patch-bcd-player::src::player_session.h mpeg4ip.NEW/files/patch-bcd-player::src::player_session.h
--- mpeg4ip/files/patch-bcd-player::src::player_session.h Wed Dec 31 16:00:00 1969
+++ mpeg4ip.NEW/files/patch-bcd-player::src::player_session.h Sat Oct 30 16:32:35 2004
@@ -0,0 +1,11 @@
+--- player/src/player_session.h Sat Oct 30 16:32:14 2004
++++ player/src/player_session.h Sat Oct 30 16:31:14 2004
+@@ -31,7 +31,7 @@
+ #define __PLAYER_SESSION_H__
+
+ #include <rtsp/rtsp_client.h>
+-#include <sdp/sdp.h>
++#include "../../lib/sdp/sdp.h"
+ #include "our_msg_queue.h"
+ #include "ip_port.h"
+
diff -ruN mpeg4ip/files/patch-bcd-player::src::rtp_bytestream.h mpeg4ip.NEW/files/patch-bcd-player::src::rtp_bytestream.h
--- mpeg4ip/files/patch-bcd-player::src::rtp_bytestream.h Wed Dec 31 16:00:00 1969
+++ mpeg4ip.NEW/files/patch-bcd-player::src::rtp_bytestream.h Sat Oct 30 15:48:40 2004
@@ -0,0 +1,13 @@
+--- player/src/rtp_bytestream.h Sat Oct 30 15:47:30 2004
++++ player/src/rtp_bytestream.h Sat Oct 30 15:47:21 2004
+@@ -28,8 +28,8 @@
+ #include "our_bytestream.h"
+ #include "player_util.h"
+ #include "rtp/rtp.h"
+-#include <SDL.h>
+-#include <SDL_thread.h>
++#include <SDL11/SDL.h>
++#include <SDL11/SDL_thread.h>
+ #include <sdp/sdp.h>
+ #include "player_session.h"
+
diff -ruN mpeg4ip/files/patch-bce-player::rtp::isma_audio::isma_rtp_plugin.h mpeg4ip.NEW/files/patch-bce-player::rtp::isma_audio::isma_rtp_plugin.h
--- mpeg4ip/files/patch-bce-player::rtp::isma_audio::isma_rtp_plugin.h Wed Dec 31 16:00:00 1969
+++ mpeg4ip.NEW/files/patch-bce-player::rtp::isma_audio::isma_rtp_plugin.h Sat Oct 30 14:47:28 2004
@@ -0,0 +1,13 @@
+--- player/plugin/rtp/isma_audio/isma_rtp_plugin.h Sat Oct 30 14:46:08 2004
++++ player/plugin/rtp/isma_audio/isma_rtp_plugin.h Sat Oct 30 14:45:58 2004
+@@ -28,8 +28,8 @@
+ #include "rtp_plugin.h"
+ #include "mp4util/mpeg4_sdp.h"
+ #include "bitstream/bitstream.h"
+-#include <SDL.h>
+-#include <SDL_thread.h>
++#include <SDL11/SDL.h>
++#include <SDL11/SDL_thread.h>
+ //#define ISMA_RTP_DUMP_OUTPUT_TO_FILE 1
+ //#define DEBUG_ISMA_RTP_FRAGS 1
+
diff -ruN mpeg4ip/files/patch-bd-common::video::libmpeg32::video::slice.h mpeg4ip.NEW/files/patch-bd-common::video::libmpeg32::video::slice.h
--- mpeg4ip/files/patch-bd-common::video::libmpeg32::video::slice.h Wed Dec 31 16:00:00 1969
+++ mpeg4ip.NEW/files/patch-bd-common::video::libmpeg32::video::slice.h Sat Oct 30 12:02:50 2004
@@ -0,0 +1,13 @@
+--- common/video/libmpeg32/video/slice.h Sat Oct 30 12:00:58 2004
++++ common/video/libmpeg32/video/slice.h Sat Oct 30 12:00:48 2004
+@@ -5,8 +5,8 @@
+ #ifndef SDL_THREADS
+ #include <pthread.h>
+ #endif
+-#include "SDL.h"
+-#include "SDL_thread.h"
++#include <SDL11/SDL.h>
++#include <SDL11/SDL_thread.h>
+
+
+ /* Array of these feeds the slice decoders */
diff -ruN mpeg4ip/files/patch-be-msg_queue::msg_queue.h mpeg4ip.NEW/files/patch-be-msg_queue::msg_queue.h
--- mpeg4ip/files/patch-be-msg_queue::msg_queue.h Wed Dec 31 16:00:00 1969
+++ mpeg4ip.NEW/files/patch-be-msg_queue::msg_queue.h Sat Oct 30 11:23:19 2004
@@ -0,0 +1,13 @@
+--- lib/msg_queue/msg_queue.h Sat Oct 30 11:20:56 2004
++++ lib/msg_queue/msg_queue.h Sat Oct 30 11:20:41 2004
+@@ -25,8 +25,8 @@
+ #define __MSG_QUEUE_H__ 1
+
+ #include "mpeg4ip.h"
+-#include <SDL.h>
+-#include <SDL_thread.h>
++#include <SDL11/SDL.h>
++#include <SDL11/SDL_thread.h>
+
+ class CMsg {
+ public:
diff -ruN mpeg4ip/files/patch-bf-server::util::xvidenc::Makefile.in mpeg4ip.NEW/files/patch-bf-server::util::xvidenc::Makefile.in
--- mpeg4ip/files/patch-bf-server::util::xvidenc::Makefile.in Wed Dec 31 16:00:00 1969
+++ mpeg4ip.NEW/files/patch-bf-server::util::xvidenc::Makefile.in Sat Oct 30 01:09:10 2004
@@ -0,0 +1,11 @@
+--- server/util/xvidenc/Makefile.in Sat Oct 30 01:07:21 2004
++++ server/util/xvidenc/Makefile.in Sat Oct 30 01:05:58 2004
+@@ -159,7 +159,7 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ ../../../lib/xvid/.libs/libmpeg4ip_xvid.so
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/xvidenc.Po
diff -ruN mpeg4ip/files/patch-bf-server::util::xvidenc::xvidenc.c mpeg4ip.NEW/files/patch-bf-server::util::xvidenc::xvidenc.c
--- mpeg4ip/files/patch-bf-server::util::xvidenc::xvidenc.c Wed Dec 31 16:00:00 1969
+++ mpeg4ip.NEW/files/patch-bf-server::util::xvidenc::xvidenc.c Sat Oct 30 15:20:37 2004
@@ -0,0 +1,36 @@
+--- server/util/xvidenc/xvidenc.c Sat Oct 30 15:18:52 2004
++++ server/util/xvidenc/xvidenc.c Sat Oct 30 15:17:04 2004
+@@ -21,18 +21,18 @@
+ */
+
+
+-#include <mpeg4ip.h>
++#include "../../../include/mpeg4ip.h"
+ #include <sys/types.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <errno.h>
+ #include <string.h>
+-#include <mpeg4ip_getopt.h>
++#include "../../../include/mpeg4ip_getopt.h"
+ #include <fcntl.h>
+ #include <math.h>
+ #include <time.h>
+-#include <xvid.h>
+-#include <mp4av.h>
++#include "../../../lib/xvid/xvid.h"
++#include "../../../lib/mp4av/mp4av.h"
+ /* globals */
+ char* progName;
+
+@@ -237,8 +237,8 @@
+ #ifdef HAVE_XVID_H
+ xvidEncParams.rc_bitrate = bitRate;
+ #else
+- xvidEncParams.bitrate = bitRate;
+- xvidEncParams.rc_buffersize = 16;
++ xvidEncParams.rc_bitrate = bitRate;
++ xvidEncParams.rc_buffer = 16;
+ #endif
+ xvidEncParams.min_quantizer = 1;
+ xvidEncParams.max_quantizer = 31;
diff -ruN mpeg4ip/files/patch-bg-util::yuv::Makefile.in mpeg4ip.NEW/files/patch-bg-util::yuv::Makefile.in
--- mpeg4ip/files/patch-bg-util::yuv::Makefile.in Wed Dec 31 16:00:00 1969
+++ mpeg4ip.NEW/files/patch-bg-util::yuv::Makefile.in Sat Oct 30 03:56:14 2004
@@ -0,0 +1,45 @@
+--- util/yuv/Makefile.in Mon Dec 22 14:52:33 2003
++++ util/yuv/Makefile.in Sat Oct 30 03:48:07 2004
+@@ -128,7 +128,7 @@
+
+ yuvdisp_SOURCES = yuvdisp.cpp
+
+-INCLUDES = -I. -I../../include -I../../lib/SDL/include
++INCLUDES = -I. -I../../include -I/usr/local/include/SDL11
+
+ AM_CFLAGS = -D_REENTRANT @BILLS_CWARNINGS@
+
+@@ -136,8 +136,10 @@
+
+ LDADD = \
+ @SDL_LIBS@ \
+- $(top_builddir)/lib/SDL/src/main/libSDLmain.a \
+- -lm
++ /usr/local/lib/libSDLmain-1.1.a \
++ -lm \
++ -lSDL-1.1 \
++ -lpthread
+
+
+ EXTRA_DIST = yuvdump60.dsp
+@@ -152,17 +154,17 @@
+ am_yuvcreate_OBJECTS = yuvcreate.$(OBJEXT)
+ yuvcreate_OBJECTS = $(am_yuvcreate_OBJECTS)
+ yuvcreate_LDADD = $(LDADD)
+-yuvcreate_DEPENDENCIES = $(top_builddir)/lib/SDL/src/main/libSDLmain.a
++yuvcreate_DEPENDENCIES = /usr/local/lib/libSDLmain-1.1.a
+ yuvcreate_LDFLAGS =
+ am_yuvdisp_OBJECTS = yuvdisp.$(OBJEXT)
+ yuvdisp_OBJECTS = $(am_yuvdisp_OBJECTS)
+ yuvdisp_LDADD = $(LDADD)
+-yuvdisp_DEPENDENCIES = $(top_builddir)/lib/SDL/src/main/libSDLmain.a
++yuvdisp_DEPENDENCIES = /usr/local/lib/libSDLmain-1.1.a
+ yuvdisp_LDFLAGS =
+ am_yuvdump_OBJECTS = yuvdump.$(OBJEXT)
+ yuvdump_OBJECTS = $(am_yuvdump_OBJECTS)
+ yuvdump_LDADD = $(LDADD)
+-yuvdump_DEPENDENCIES = $(top_builddir)/lib/SDL/src/main/libSDLmain.a
++yuvdump_DEPENDENCIES = /usr/local/lib/libSDLmain-1.1.a
+ yuvdump_LDFLAGS =
+
+ DEFS = @DEFS@
diff -ruN mpeg4ip/files/patch-gcc34 mpeg4ip.NEW/files/patch-gcc34
--- mpeg4ip/files/patch-gcc34 Sat Oct 30 20:08:29 2004
+++ mpeg4ip.NEW/files/patch-gcc34 Wed Dec 31 16:00:00 1969
@@ -1,11 +0,0 @@
---- common/video/mpeg4-2000/idct/idct.hpp.orig Fri Jul 23 01:57:47 2004
-+++ common/video/mpeg4-2000/idct/idct.hpp Fri Jul 23 02:02:41 2004
-@@ -22,7 +22,7 @@
- #ifndef _INT_IDCT_
- #define _INT_IDCT_ 1
-
--
-+#define BLOCK_SIZE 5
- #define IDCT_BLOCK_SIZE 8
- class idct{
- public:
diff -ruN mpeg4ip/files/patch-include::mpeg4ip_byteswap.h mpeg4ip.NEW/files/patch-include::mpeg4ip_byteswap.h
--- mpeg4ip/files/patch-include::mpeg4ip_byteswap.h Sat Oct 30 20:08:29 2004
+++ mpeg4ip.NEW/files/patch-include::mpeg4ip_byteswap.h Wed Dec 31 16:00:00 1969
@@ -1,26 +0,0 @@
---- include/mpeg4ip_byteswap.h.orig Wed Nov 13 16:44:43 2002
-+++ include/mpeg4ip_byteswap.h Wed Nov 13 16:44:47 2002
-@@ -26,2 +26,6 @@
-
-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
-+#include <sys/param.h>
-+#endif
-+
- #if defined(WORDS_BIGENDIAN)
-@@ -51,2 +55,16 @@
- #define B2N_64(x) x = swap64(x)
-+
-+#elif defined(__FreeBSD__) && __FreeBSD_version >= 470000
-+#include <sys/endian.h>
-+#define B2N_16(x) (be16toh(x))
-+#define B2N_32(x) (be32toh(x))
-+#define B2N_64(x) \
-+ x = ((((x) & 0xff00000000000000) >> 56) | \
-+ (((x) & 0x00ff000000000000) >> 40) | \
-+ (((x) & 0x0000ff0000000000) >> 24) | \
-+ (((x) & 0x000000ff00000000) >> 8) | \
-+ (((x) & 0x00000000ff000000) << 8) | \
-+ (((x) & 0x0000000000ff0000) << 24) | \
-+ (((x) & 0x000000000000ff00) << 40) | \
-+ (((x) & 0x00000000000000ff) << 56))
-
diff -ruN mpeg4ip/files/patch-include::mpeg4ip_getopt.h mpeg4ip.NEW/files/patch-include::mpeg4ip_getopt.h
--- mpeg4ip/files/patch-include::mpeg4ip_getopt.h Sat Oct 30 20:08:29 2004
+++ mpeg4ip.NEW/files/patch-include::mpeg4ip_getopt.h Wed Dec 31 16:00:00 1969
@@ -1,12 +0,0 @@
---- include/mpeg4ip_getopt.h.orig Tue Oct 15 13:12:27 2002
-+++ include/mpeg4ip_getopt.h Mon Feb 24 05:23:50 2003
-@@ -11,6 +11,9 @@
- #endif
-
- #ifdef HAVE_GETOPT_H
-+#ifdef __FreeBSD__
-+#define __GNU_LIBRARY__
-+#endif
- #include <getopt.h>
- #endif
-
diff -ruN mpeg4ip/files/patch-lib::Makefile.in mpeg4ip.NEW/files/patch-lib::Makefile.in
--- mpeg4ip/files/patch-lib::Makefile.in Sat Oct 30 20:08:29 2004
+++ mpeg4ip.NEW/files/patch-lib::Makefile.in Wed Dec 31 16:00:00 1969
@@ -1,11 +0,0 @@
---- lib/Makefile.in.orig Wed Jan 1 21:46:28 2003
-+++ lib/Makefile.in Wed Jan 1 21:47:39 2003
-@@ -110,7 +110,7 @@
- am__include = @am__include@
- am__quote = @am__quote@
- install_sh = @install_sh@
--SUBDIRS = avi bitstream config_file fposrec gnu mp4 mp4v2 mp4av msg_queue rtp sdp SDL xvid mpeg2t SDL_VisualC
-+SUBDIRS = avi bitstream config_file fposrec gnu mp4 mp4v2 mp4av msg_queue rtp sdp xvid mpeg2t
- subdir = lib
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
diff -ruN mpeg4ip/files/patch-lib::xvid::bitstream::h263.h mpeg4ip.NEW/files/patch-lib::xvid::bitstream::h263.h
--- mpeg4ip/files/patch-lib::xvid::bitstream::h263.h Sat Oct 30 20:08:29 2004
+++ mpeg4ip.NEW/files/patch-lib::xvid::bitstream::h263.h Wed Dec 31 16:00:00 1969
@@ -1,30 +0,0 @@
---- lib/xvid/bitstream/h263.h.orig Wed Nov 13 16:53:29 2002
-+++ lib/xvid/bitstream/h263.h Wed Nov 13 16:55:31 2002
-@@ -25,6 +25,10 @@
- /* #define FFMPEG_VERSION_INT 0x000405 */
- /* #define FFMPEG_VERSION "0.4.5" */
-
-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
-+#include <sys/param.h>
-+#endif
-+
- #ifdef WIN32
- #define CONFIG_WIN32
- #endif
-@@ -69,11 +73,16 @@
- #define DEBUG
- #endif
-
-+#if defined(__FreeBSD__) && __FreeBSD_version >= 470000
-+#include <sys/endian.h>
-+#define be2me_32(x) (be32toh(x))
-+#else
- // code from bits/byteswap.h (C) 1997, 1998 Free Software Foundation, Inc.
- #define bswap_32(x) \
- ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | \
- (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24))
- #define be2me_32(x) bswap_32(x)
-+#endif
-
- #define snprintf _snprintf
-
diff -ruN mpeg4ip/files/patch-mpeg4ip_config.h.in mpeg4ip.NEW/files/patch-mpeg4ip_config.h.in
--- mpeg4ip/files/patch-mpeg4ip_config.h.in Sat Oct 30 20:08:29 2004
+++ mpeg4ip.NEW/files/patch-mpeg4ip_config.h.in Wed Dec 31 16:00:00 1969
@@ -1,24 +0,0 @@
---- mpeg4ip_config.h.in.orig Sun Apr 11 10:24:26 2004
-+++ mpeg4ip_config.h.in Sun Apr 11 10:24:48 2004
-@@ -22,13 +22,10 @@
- #undef HAVE_FPOS_T_POS
-
- /* Define to 1 if you have the `getopt' function. */
--#undef HAVE_GETOPT
-
- /* Define to 1 if you have the <getopt.h> header file. */
--#undef HAVE_GETOPT_H
-
- /* Define to 1 if you have the `getopt_long' function. */
--#undef HAVE_GETOPT_LONG
-
- /* Define to 1 if you have the `getopt_long_only' function. */
- #undef HAVE_GETOPT_LONG_ONLY
-@@ -58,7 +55,6 @@
- #undef HAVE_IPv6
-
- /* Define to 1 if you have the `gnugetopt' library (-lgnugetopt). */
--#undef HAVE_LIBGNUGETOPT
-
- /* Define to 1 if you have the `socket' library (-lsocket). */
- #undef HAVE_LIBSOCKET
--- mpeg4ip.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20041031034038.2C3552CE794>