head 1.5; access; symbols pkgsrc-2013Q2:1.5.0.10 pkgsrc-2013Q2-base:1.5 pkgsrc-2012Q4:1.5.0.8 pkgsrc-2012Q4-base:1.5 pkgsrc-2011Q4:1.5.0.6 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q2:1.5.0.4 pkgsrc-2011Q2-base:1.5 pkgsrc-2009Q4:1.5.0.2 pkgsrc-2009Q4-base:1.5 pkgsrc-2009Q2:1.2.0.8 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.6 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.4 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.2 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.1.0.10 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.8 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.6 pkgsrc-2008Q1:1.1.0.4 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.2 pkgsrc-2007Q4-base:1.1; locks; strict; comment @# @; 1.5 date 2009.08.11.11.16.38; author drochner; state dead; branches; next 1.4; 1.4 date 2009.08.10.00.01.56; author tnn; state Exp; branches; next 1.3; 1.3 date 2009.08.08.04.24.20; author tnn; state Exp; branches; next 1.2; 1.2 date 2008.09.24.22.25.14; author tonnerre; state Exp; branches; next 1.1; 1.1 date 2007.12.09.10.55.37; author drochner; state Exp; branches 1.1.8.1; next ; 1.1.8.1 date 2008.09.26.14.42.13; author tron; state Exp; branches; next ; desc @@ 1.5 log @make the installed include files more consistent: don't rely on HAVE_STDINT_H defined by the client app, don't install mp4ffint.h which is purely internal, fix build of the xmms plugin, bump PKGREVISION @ text @$NetBSD: patch-at,v 1.4 2009/08/10 00:01:56 tnn Exp $ --- frontend/main.c.orig 2008-09-22 19:55:09.000000000 +0200 +++ frontend/main.c @@@@ -44,6 +44,7 @@@@ #include #include +#include /* for uint32_t */ #include #include "audio.h" @ 1.4 log @- Update to faad2-2.7 - set LICENSE to gnu-gpl-v2 - install faad(1) manpage 2009-02-02 - Version 2.7 * DAB+ support * Use public headers internally to prevent duplicate declarations * Explicitly typedef all types as signed * Made sure MAIN prediction can't be started after the first frame * Lot's of compilation issues solved * Bugfix in SBR envelope border calculation @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @patch-at: fix build on Linux (uint32_t was not in scope) @ text @d3 1 a3 1 --- frontend/main.c.orig 2007-11-01 13:33:29.000000000 +0100 d5 1 a5 1 @@@@ -43,6 +43,7 @@@@ a12 23 @@@@ -914,6 +915,8 @@@@ int decodeMP4file(char *mp4file, char *s sample_count = frameInfo.samples; } else { sample_count = (unsigned int)(dur * frameInfo.channels); + if (sample_count > frameInfo.samples) + sample_count = frameInfo.samples; if (!useAacLength && !initial && (sampleId < numSamples/2) && (sample_count != frameInfo.samples)) { @@@@ -1189,11 +1192,13 @@@@ int main(int argc, char *argv[]) return 1; } +#if 0 /* only allow raw data on stdio */ if (writeToStdio == 1) { format = 2; } +#endif /* point to the specified file name */ strcpy(aacFileName, argv[optind]); @ 1.2 log @Fix for faad2 decodeMP4file() heap overflow. If the sample count looks insane, it may as well be insane. Also bump PKGREVISION. @ text @d5 9 a13 1 @@@@ -914,6 +914,8 @@@@ int decodeMP4file(char *mp4file, char *s d22 1 a22 1 @@@@ -1189,11 +1191,13 @@@@ int main(int argc, char *argv[]) @ 1.1 log @update to 2.6.1 This adds SBR/PS support and bugfixes. The licensing problems which appeared in 2.5 were resolved in 2.6.1. pkgsrc notes: -no dependency on libmp4v2 anymore -added a patch to the "faad" standalone player to restore previous behaviour: The -w option writes .wav format (with riff header) to stdout. Thanks to Raymond Meyer for help and testing. @ text @d3 1 a3 1 --- frontend/main.c.orig 2007-12-08 17:49:45.000000000 +0100 d5 10 a14 1 @@@@ -1189,11 +1189,13 @@@@ int main(int argc, char *argv[]) @ 1.1.8.1 log @Pullup ticket #2533 - tonnerre faad2: security patch Revisions pulled up: - audio/faad2/Makefile 1.41 - audio/faad2/distinfo 1.17 - audio/faad2/patches/patch-at 1.2 --- Module Name: pkgsrc Committed By: tonnerre Date: Wed Sep 24 22:25:14 UTC 2008 Modified Files: pkgsrc/audio/faad2: Makefile distinfo pkgsrc/audio/faad2/patches: patch-at Log Message: Fix for faad2 decodeMP4file() heap overflow. If the sample count looks insane, it may as well be insane. Also bump PKGREVISION. @ text @d3 1 a3 1 --- frontend/main.c.orig 2007-11-01 13:33:29.000000000 +0100 d5 1 a5 10 @@@@ -914,6 +914,8 @@@@ int decodeMP4file(char *mp4file, char *s sample_count = frameInfo.samples; } else { sample_count = (unsigned int)(dur * frameInfo.channels); + if (sample_count > frameInfo.samples) + sample_count = frameInfo.samples; if (!useAacLength && !initial && (sampleId < numSamples/2) && (sample_count != frameInfo.samples)) { @@@@ -1189,11 +1191,13 @@@@ int main(int argc, char *argv[]) @