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

- faac/faad related changes

Browse Source 
- bump PKGNAME

ok brad@
This commit is contained in:
jakemsr 2008-09-15 22:08:40 +00:00
parent 3028e0bf4d
commit d47f33c8b5
2 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
multimedia/avidemux/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.16 2008/07/25 08:08:20 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.17 2008/09/15 22:08:40 jakemsr Exp $
COMMENT= free video editor
V= 2.4.3
DISTNAME= avidemux_${V}
PKGNAME= avidemux-${V}
PKGNAME= avidemux-${V}p0
CATEGORIES= multimedia
@ -32,8 +32,8 @@ MODULES= devel/gettext
BUILD_DEPENDS= :autoconf-${AUTOCONF_VERSION}:devel/autoconf/${AUTOCONF_VERSION} \
:automake-${AUTOMAKE_VERSION}.*:devel/automake/${AUTOMAKE_VERSION}
LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
faac::audio/faac \
faad.>=1::audio/faad \
faac.>=1::audio/faac \
faad.>=2::audio/faad \
mp3lame.>=1::audio/lame \
vorbis.>=5,vorbisenc.>=2::audio/libvorbis \
xml2.>=9::textproc/libxml \

30
multimedia/avidemux/patches/patch-avidemux_ADM_audiocodec_ADM_codecfaad_cpp
View File

@ -1,37 +1,21 @@
$OpenBSD: patch-avidemux_ADM_audiocodec_ADM_codecfaad_cpp,v 1.2 2008/03/19 09:21:37 ajacoutot Exp $
--- avidemux/ADM_audiocodec/ADM_codecfaad.cpp.orig Mon Jan 7 09:14:57 2008
+++ avidemux/ADM_audiocodec/ADM_codecfaad.cpp Mon Jan 7 09:16:14 2008
@@ -34,11 +34,11 @@ ADM_faad::ADM_faad( uint32_t fourcc ,uint32_t highEffi
$OpenBSD: patch-avidemux_ADM_audiocodec_ADM_codecfaad_cpp,v 1.3 2008/09/15 22:08:40 jakemsr Exp $
--- avidemux/ADM_audiocodec/ADM_codecfaad.cpp.orig Thu Jul 17 01:40:39 2008
+++ avidemux/ADM_audiocodec/ADM_codecfaad.cpp Thu Jul 17 01:43:46 2008
@@ -34,7 +34,7 @@ ADM_faad::ADM_faad( uint32_t fourcc ,uint32_t highEffi
{
faacDecConfigurationPtr conf;
#ifdef OLD_FAAD_PROTO
-unsigned long int srate;
+uint32_t srate;
+unsigned int srate;
#else
uint32_t srate;
#endif
-unsigned char chan;
+uint8_t chan;
_inited=0;
_instance=NULL;
_inbuffer=0;
@@ -115,16 +115,16 @@ uint8_t ADM_faad::endDecompress( void )
uint8_t ADM_faad::run(uint8_t *inptr, uint32_t nbIn, float *outptr, uint32_t *nbOut)
{
uint32_t xin;
-long int res;
+int32_t res;
void *outbuf;
@@ -120,7 +120,7 @@ void *outbuf;
faacDecFrameInfo info;
int max=0;
#ifdef OLD_FAAD_PROTO
-unsigned long int srate;
+uint32_t srate;
+unsigned int srate;
#else
uint32_t srate;
#endif
-unsigned char chan=0;
+uint8_t chan=0;
uint8_t first=0;