head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.22
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.20
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.18
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.16
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.14
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.12
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.10
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.8
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.6
	pkgsrc-2008Q2-base:1.2
	pkgsrc-2008Q1:1.2.0.4
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.2
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.1.0.12
	pkgsrc-2007Q3-base:1.1
	pkgsrc-2007Q2:1.1.0.10
	pkgsrc-2007Q2-base:1.1
	pkgsrc-2007Q1:1.1.0.8
	pkgsrc-2007Q1-base:1.1
	pkgsrc-2006Q4:1.1.0.6
	pkgsrc-2006Q4-base:1.1
	pkgsrc-2006Q3:1.1.0.4
	pkgsrc-2006Q3-base:1.1
	pkgsrc-2006Q2:1.1.0.2
	pkgsrc-2006Q2-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2007.12.09.10.55.35;	author drochner;	state dead;
branches;
next	1.1;

1.1
date	2006.05.30.20.28.34;	author tron;	state Exp;
branches;
next	;


desc
@@


1.2
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
@$NetBSD: patch-an,v 1.1 2006/05/30 20:28:34 tron Exp $

--- plugins/mpeg4ip/aa_file.cpp.orig	2004-01-05 14:05:12.000000000 +0000
+++ plugins/mpeg4ip/aa_file.cpp	2006-05-30 16:04:22.000000000 +0100
@@@@ -77,7 +77,7 @@@@
 
 int aac_file_next_frame (codec_data_t *your,
              uint8_t **buffer,
-             uint64_t *ts)
+             frame_timestamp_t *ts)
 {
   aac_codec_t *aac = (aac_codec_t *)your;
 
@@@@ -98,7 +98,7 @@@@
   uint64_t calc;
   calc = aac->m_framecount * 1024 * M_LLU;
   calc /= aac->m_freq;
-  *ts = calc;
+  ts->msec_timestamp = calc;
   *buffer = aac->m_buffer;
   aac->m_framecount++;
   return (aac->m_buffer_size);
@


1.1
log
@Disable bundled and outdated "mp4v2" library. Depend on newer version
from "mpeg4ip" package instead which resolves the conflict between
the two packages. Patch taken from PLD linux.
Bump package revision because of thix fix.
@
text
@d1 1
a1 1
$NetBSD$
@