diff options
| -rw-r--r-- | multimedia/mpeg4ip/Makefile | 8 | ||||
| -rw-r--r-- | multimedia/mpeg4ip/files/extra-patch-lib::sdp::sdp_decode.c | 19 |
2 files changed, 16 insertions, 11 deletions
diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile index d7c91c7136a8..2a556b8a73d9 100644 --- a/multimedia/mpeg4ip/Makefile +++ b/multimedia/mpeg4ip/Makefile @@ -22,7 +22,8 @@ LIB_DEPENDS= faac.0:${PORTSDIR}/audio/faac \ id3tag.2:${PORTSDIR}/audio/libid3tag \ a52.0:${PORTSDIR}/audio/liba52 \ mpeg2.0:${PORTSDIR}/multimedia/libmpeg2 \ - avcodec.1:${PORTSDIR}/multimedia/ffmpeg + avcodec.1:${PORTSDIR}/multimedia/ffmpeg \ + mp4v2.0:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2 USE_GNOME= \ gtk20 \ @@ -98,11 +99,6 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-player::src::codec::mp3::mp3_file.cpp USE_GCC= 3.4 .endif -# XXX - temporary fix, not suitable for binaries -.if ${ARCH} == "amd64" -CFLAGS+= -fPIC -DPIC -.endif - ### ## Auto detect possible extensions ### diff --git a/multimedia/mpeg4ip/files/extra-patch-lib::sdp::sdp_decode.c b/multimedia/mpeg4ip/files/extra-patch-lib::sdp::sdp_decode.c index 7f37b6259172..08933c2df331 100644 --- a/multimedia/mpeg4ip/files/extra-patch-lib::sdp::sdp_decode.c +++ b/multimedia/mpeg4ip/files/extra-patch-lib::sdp::sdp_decode.c @@ -1,20 +1,29 @@ ---- lib/sdp/sdp_decode.c.orig Thu Sep 30 01:32:23 2004 -+++ lib/sdp/sdp_decode.c Thu Sep 30 01:32:45 2004 +--- lib/sdp/sdp_decode.c.orig Tue Feb 24 15:54:20 2004 ++++ lib/sdp/sdp_decode.c Mon Nov 22 20:17:07 2004 @@ -378,7 +378,7 @@ q = NULL; while (p != NULL) { if (new->adj_time == p->adj_time) { - sdp_debug(LOG_NOTICE, "Duplicate time %ld in adj description", p->adj_time); -+ sdp_debug(LOG_NOTICE, "Duplicate time %d in adj description", p->adj_time); ++ sdp_debug(LOG_NOTICE, "Duplicate time %ld in adj description", (long)p->adj_time); free(new); return (start); } -@@ -1580,7 +1580,7 @@ +@@ -1558,6 +1558,7 @@ + int valid; + time_adj_desc_t *start_aptr, *aptr; + time_t adj_time; ++ long adj_time_l; + int32_t offset; + int possign; + int err; +@@ -1580,7 +1581,8 @@ continue; } // process <adjustment time> - adjust it from NTP to unix time - sscanf(sep, "%ld", &adj_time); -+ sscanf(sep, "%d", &adj_time); ++ sscanf(sep, "%ld", &adj_time_l); ++ adj_time = adj_time_l; // Check for negative sign for offset. ADV_SPACE(lptr); |