# ChangeLog for media-video/mjpegtools

# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2

# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.148 2010/02/20 14:46:51 armin76 Exp $

  20 Feb 2010; Raúl Porcel <armin76@gentoo.org> mjpegtools-1.9.0-r1.ebuild:

  alpha/sparc stable wrt #302435

  16 Feb 2010; Markus Meier <maekke@gentoo.org> mjpegtools-1.9.0-r1.ebuild:

  x86 stable, bug #302435

  15 Feb 2010; Joseph Jezak <josejx@gentoo.org> mjpegtools-1.9.0-r1.ebuild:

  Marked ppc stable for bug #302435.

  03 Feb 2010; Markos Chandras <hwoarang@gentoo.org>

  mjpegtools-1.9.0-r1.ebuild:

  Stable on amd64 wrt bug #302435

  27 Jan 2010; Brent Baude <ranger@gentoo.org> mjpegtools-1.9.0-r1.ebuild:

  stable ppc64, bug 302435

*mjpegtools-1.9.0-r1 (23 Jan 2010)

  23 Jan 2010; Samuli Suominen <ssuominen@gentoo.org>

  +mjpegtools-1.9.0-r1.ebuild, +files/mjpegtools-1.9.0-jpeg-7.patch:

  Fix jpeg2yuv segmentation fault with jpeg-7 and above wrt #293919 by Salah

  Coronya.

  22 Jan 2010; Samuli Suominen <ssuominen@gentoo.org>

  mjpegtools-1.9.0.ebuild:

  Require SLOT="0" of media-libs/jpeg for headers.

  27 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>

  mjpegtools-1.8.0-r2.ebuild, +files/mjpegtools-1.8.0-glibc-2.10.patch:

  Fix building with GCC 4.4+ and GLIBC 2.10+ wrt #282960 by Chris Slycord.

  22 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>

  mjpegtools-1.8.0-r2.ebuild, +files/mjpegtools-1.8.0-libc.patch:

  Fix building with GCC 4.3+ and glibc-2.8+ wrt #240379, thanks to Chris

  Slycord.

  04 Jun 2009; Peter Alfredsen <loki_val@gentoo.org>

  mjpegtools-1.9.0.ebuild, +files/mjpegtools-1.9.0-glibc-2.10.patch:

  Fix the constness of a char w.r.t. bug 270778. Thanks to hirakendu

  <hirakendu@gmail.com> for providing the patch.

  03 Mar 2009; Raúl Porcel <armin76@gentoo.org> mjpegtools-1.9.0.ebuild:

  sparc stable wrt #217427

  15 Feb 2009; Tobias Klausmann <klausman@gentoo.org>

  mjpegtools-1.9.0.ebuild:

  Stable on alpha, bug #217427

  15 Feb 2009; Brent Baude <ranger@gentoo.org> mjpegtools-1.9.0.ebuild:

  stable ppc, bug 217427

  14 Feb 2009; Markus Meier <maekke@gentoo.org> mjpegtools-1.9.0.ebuild:

  amd64/x86 stable, bug #217427

  13 Feb 2009; Brent Baude <ranger@gentoo.org> mjpegtools-1.9.0.ebuild:

  stable ppc64, bug 217427

*mjpegtools-1.9.0 (10 Jan 2009)

  10 Jan 2009; Steve Dibb <beandog@gentoo.org> +mjpegtools-1.9.0.ebuild:

  Version bump

*mjpegtools-1.9.0_rc4 (04 Jan 2009)

  04 Jan 2009; Ben de Groot <yngwin@gentoo.org>

  +mjpegtools-1.9.0_rc4.ebuild:

  Version bump, fixes bug 252352

  20 Apr 2008; Mike Frysinger <vapier@gentoo.org>

  +files/mjpegtools-1.9.0_rc3-gcc43.patch, mjpegtools-1.9.0_rc3.ebuild:

  Fix by Ryan Hill for building with gcc-4.3 #200767.

*mjpegtools-1.9.0_rc3 (04 Dec 2007)

  04 Dec 2007; Matthias Schwarzott <zzam@gentoo.org>

  +mjpegtools-1.9.0_rc3.ebuild:

  Version bumped. Seems to solve some rate control problem and maybe more

  small bugs.

  27 Nov 2007; Matthias Schwarzott <zzam@gentoo.org>

  mjpegtools-1.8.0-r1.ebuild, mjpegtools-1.8.0-r2.ebuild,

  mjpegtools-1.9.0_rc1.ebuild, mjpegtools-1.9.0_rc2.ebuild:

  Fixed quoting.

  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;

  mjpegtools-1.8.0-r1.ebuild, mjpegtools-1.8.0-r2.ebuild,

  mjpegtools-1.9.0_rc1.ebuild, mjpegtools-1.9.0_rc2.ebuild:

  Drop virtual/x11 references.

*mjpegtools-1.9.0_rc2 (05 Mar 2007)

  05 Mar 2007; Matthias Schwarzott <zzam@gentoo.org>

  +mjpegtools-1.9.0_rc2.ebuild:

  Version bumped. All patches/m4 files in upstream tarball now :).

*mjpegtools-1.9.0_rc1 (25 Feb 2007)

  25 Feb 2007; Matthias Schwarzott <zzam@gentoo.org>

  +files/mjpegtools-1.9.0_rc1-as-needed.patch,

  +files/mjpegtools-1.9.0_rc1-lavrec-memleak.patch,

  +files/mjpegtools-1.9.0_rc1-pkg-config.patch,

  +mjpegtools-1.9.0_rc1.ebuild:

  Version bumped.

  20 Nov 2006; Matthias Schwarzott <zzam@gentoo.org>

  +files/mjpegtools-1.8.0-no-jpeg-mmx.patch, mjpegtools-1.8.0-r1.ebuild,

  mjpegtools-1.8.0-r2.ebuild:

  Explicitly disable usage of jpeg-mmx to prevent automagic depend.

  19 Nov 2006; Matthias Schwarzott <zzam@gentoo.org>

  files/mjpegtools-1.8.0-fix-lav2mpeg.patch:

  Added lost hunk to patch for Bug #137530 :).

*mjpegtools-1.8.0-r2 (19 Nov 2006)

  19 Nov 2006; Matthias Schwarzott <zzam@gentoo.org>

  +files/mjpegtools-1.8.0-fix-lav2mpeg.patch,

  +files/mjpegtools-1.8.0-lavrec-memleak.patch, +mjpegtools-1.8.0-r2.ebuild:

  Added fixes for various bugs (#152568, #128404 and #137530).

  03 Nov 2006; Matthias Schwarzott <zzam@gentoo.org>

  mjpegtools-1.8.0-r1.ebuild:

  Correct dependency to gtk+-2, Bug #150344. Changed configure-argument for

  libdv to actually work :).

  03 Nov 2006; Matthias Schwarzott <zzam@gentoo.org>

  mjpegtools-1.8.0-r1.ebuild:

  Removed movtar-dependency as it seems no longer needed, Bug #150344.

  03 Nov 2006; Matthias Schwarzott <zzam@gentoo.org>

  mjpegtools-1.8.0-r1.ebuild:

  Added correct automake and pkgconfig dependency.

  06 Sep 2006; Matthias Schwarzott <zzam@gentoo.org>

  mjpegtools-1.8.0-r1.ebuild:

  Added missing m4-files for autoconf, solves Bug #117091.

  28 Aug 2006; Matthias Schwarzott <zzam@gentoo.org>

  files/mjpegtools-1.8.0-as-needed.patch:

  Added the make-dependencies which broke parallel building when having the

  as-needed patch applied. Bug #145265.

  25 Aug 2006; Matthias Schwarzott <zzam@gentoo.org>

  +files/mjpegtools-1.8.0-as-needed.patch, mjpegtools-1.8.0-r1.ebuild:

  Fixed linking with --as-needed, see bug #144656.

  25 Aug 2006; Matthias Schwarzott <zzam@gentoo.org>

  +files/mjpegtools-1.8.0-pkg-config.patch, mjpegtools-1.8.0-r1.ebuild:

  Fixed problem with missing png-support when USE=-quicktime, bug #144551.

  Added use-flag png and dependency to libpng which has been missing up to

  now.

  25 Aug 2006; Matthias Schwarzott <zzam@gentoo.org>

  +files/mjpegtools-1.8.0-pkg-config.patch, mjpegtools-1.8.0-r1.ebuild:

  Fixed problem with missing png-support when USE=-quicktime, bug #144551.

  Added use-flag png and dependency to libpng which has been missing up to

  now.

  30 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>

  +files/mjpegtools-1.8.0-libquicktime.patch, mjpegtools-1.8.0-r1.ebuild:

  Add patch from bug #128619 when using libquicktime 0.9.9, thanks to Mario

  Fetka; also fix quicktime useflag, thanks to Eldad Zack (eldad), both in bug

  #128619.

  27 Apr 2006; Marien Zwart <marienz@gentoo.org> Manifest:

  Fixing SHA256 digest, pass four

  24 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>

  -files/mjpegtools-1.6.2-configure.patch, -files/mjpegtools-1.6.2-dv.patch,

  -files/mjpegtools-1.6.2-fPIC.patch,

  -files/mjpegtools-1.6.2-gcc34-altivec.patch,

  -files/mjpegtools-1.6.2-gcc34.patch,

  -files/mjpegtools-1.6.2-libquicktime094.patch,

  -files/mjpegtools-1.6.2-nogtk.patch, -files/altivec-fix-1.6.2.patch,

  -files/no-x11-lib-2.patch, -mjpegtools-1.6.2-r4.ebuild:

  Drop old mjpegtools version.

  07 Feb 2006; Aron Griffis <agriffis@gentoo.org>

  mjpegtools-1.8.0-r1.ebuild:

  Mark 1.8.0-r1 stable on alpha

  05 Feb 2006; Diego Pettenò <flameeyes@gentoo.org>

  +files/mjpegtools-1.8.0-parallelmake.patch, mjpegtools-1.8.0-r1.ebuild:

  Fix parallel make issues, bug #121622.

  04 Feb 2006; Diego Pettenò <flameeyes@gentoo.org>

  mjpegtools-1.8.0-r1.ebuild:

  Don't run autotools as there's no patch touching them, run only elibtoolize

  instead. Don't force -j1 on emake. Append -fno-strict-aliasing as it

  dereference type-punned pointers.

  04 Feb 2006; Diego Pettenò <flameeyes@gentoo.org>

  mjpegtools-1.6.2-r4.ebuild, mjpegtools-1.8.0-r1.ebuild:

  Drop dependencies over autotools, autotools eclass take care of that. Change

  autoreconf call to eautoreconf.

  26 Dec 2005; Simon Stelling <blubb@gentoo.org> mjpegtools-1.8.0-r1.ebuild:

  stable on amd64

  24 Dec 2005; Michael Hanselmann <hansmi@gentoo.org>

  mjpegtools-1.8.0-r1.ebuild:

  Stable on ppc.

  21 Dec 2005; Mark Loeser <halcy0n@gentoo.org> mjpegtools-1.8.0-r1.ebuild:

  Stable on x86; bug #100869

  20 Dec 2005; Gustavo Zacarias <gustavoz@gentoo.org>

  mjpegtools-1.8.0-r1.ebuild:

  Stable on sparc wrt security #100869

  19 Dec 2005; Markus Rothe <corsair@gentoo.org> mjpegtools-1.8.0-r1.ebuild:

  Stable on ppc64; bug #100869

  19 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>

  +files/mjpegtools-1.8.0-gcc41.patch, mjpegtools-1.8.0-r1.ebuild:

  Add patch to build with GCC 4.1, thanks to Christian Schmidt in bug #116014.

  17 Dec 2005; Luca Barbato <lu_zero@gentoo.org> -mjpegtools-1.8.0.ebuild:

  Cleanup

  12 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;

  mjpegtools-1.8.0-r1.ebuild:

  Add modular X dependencies.

  13 Nov 2005; Luca Barbato <lu_zero@gentoo.org> mjpegtools-1.6.2-r4.ebuild,

  mjpegtools-1.8.0-r1.ebuild:

  avifile removed

*mjpegtools-1.8.0-r1 (01 Nov 2005)

  01 Nov 2005; Simon Stelling <blubb@gentoo.org>

  +mjpegtools-1.8.0-r1.ebuild:

  revision bump to enable SIMD extensions on amd64; bug 108417

*mjpegtools-1.8.0 (19 Sep 2005)

  05 Oct 2005; Marc Hildebrand <zypher@gentoo.org>

  +mjpegtools-1.8.0.ebuild:

  Version bump, closes bug #107824. Thanks to Paul Dunwoody for the ebuild.

  15 Sep 2005; Aron Griffis <agriffis@gentoo.org>

  mjpegtools-1.6.2-r4.ebuild:

  Mark 1.6.2-r4 stable on alpha

  06 Aug 2005; Doug Goldstein <cardoe@gentoo.org>

  -mjpegtools-1.6.2-r3.ebuild:

  remove old version that had some old stuff that was making the reporter 

  of bug #100974 angry

  28 Jul 2005; Diego Pettenò <flameeyes@gentoo.org>

  mjpegtools-1.6.2-r3.ebuild, mjpegtools-1.6.2-r4.ebuild:

  Updated dependeny over jpeg-mmx as per bug #100554.

  18 Jun 2005; Markus Rothe <corsair@gentoo.org> mjpegtools-1.6.2-r4.ebuild:

  Stable on ppc64

  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>

  mjpegtools-1.6.2-r4.ebuild:

  Stable on ppc.

  08 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org>

  mjpegtools-1.6.2-r4.ebuild:

  Stable on sparc

  06 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org>

  mjpegtools-1.6.2-r4.ebuild:

  stable on amd64 and x86.

  17 May 2005; Gustavo Zacarias <gustavoz@gentoo.org>

  mjpegtools-1.6.2-r3.ebuild:

  Stable on sparc

  15 May 2005; Diego Pettenò <flameeyes@gentoo.org>

  mjpegtools-1.6.2-r3.ebuild, mjpegtools-1.6.2-r4.ebuild:

  Moved to use toolchain-functs eclass.

  08 May 2005; Bryan Østergaard <kloeri@gentoo.org>

  mjpegtools-1.6.2-r4.ebuild:

  ~alpha keyword.

*mjpegtools-1.6.2-r4 (17 Apr 2005)

  17 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>

  +mjpegtools-1.6.2-r4.ebuild:

  added a patch to fix #78404. thanks to Kevin F. Quinn <co@kevquinn.com> and

  Ned Ludd <solar@gentoo.org>

  16 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>

  +files/mjpegtools-1.6.2-libquicktime094.patch, mjpegtools-1.6.2-r3.ebuild:

  added patch to make compilation with libquicktime-0.9.4 possible (patch based

  on upstream cvs), also enabled largefile support which fixes #66039

  27 Mar 2005; Luca Barbato <lu_zero@gentoo.org>

  +files/mjpegtools-1.6.2-configure.patch, mjpegtools-1.6.2-r3.ebuild:

  Updated ebuild, from Diego Pettenò <dgp85@users.sourceforge.net>

  26 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>

  -files/1.6.0-r7-ppc.patch, -files/mjpegtools-1.6.0-gcc3.patch,

  -files/mjpegtools-1.6.1.91-fPIC.patch,

  -files/mjpegtools-1.6.1.92-fPIC.patch,

  -files/mjpegtools-1.6.1.93-fPIC.patch, -files/no-x11-lib.patch,

  -mjpegtools-1.6.0-r7.ebuild, -mjpegtools-1.6.1.90-r2.ebuild,

  -mjpegtools-1.6.2-r1.ebuild, mjpegtools-1.6.2-r3.ebuild:

  Removing older versions. Fixing avifile dependency to accept newer versions

  as it does compile with them.

  15 Mar 2005; Luca Barbato <lu_zero@gentoo.org> mjpegtools-1.6.2-r3.ebuild:

  yet another workaround for gcc

  13 Mar 2005; Luca Barbato <lu_zero@gentoo.org>

  +files/mjpegtools-1.6.2-dv.patch, mjpegtools-1.6.2-r3.ebuild:

  Fixed libdv issues

  10 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>

  mjpegtools-1.6.2-r3.ebuild:

  changed the dv and yv12 use_enable logic, fixes #79379

  20 Feb 2005; Joseph Jezak <josejx@gentoo.org> mjpegtools-1.6.2-r3.ebuild:

  Changed the libtool fix to apply to everyone.

  06 Feb 2005; Markus Rothe <corsair@gentoo.org> mjpegtools-1.6.2-r3.ebuild:

  Stable on ppc64

  11 Jan 2005; Luca Barbato <lu_zero@gentoo.org> mjpegtools-1.6.2-r3.ebuild:

  Deps updated, should fix bug #71867

  18 Dec 2004; Markus Rothe <corsair@gentoo.org> mjpegtools-1.6.2-r3.ebuild:

  added ~ppc64 to KEYWORDS; bug #74834

  16 Dec 2004; Simon Stelling <blubb@gentoo.org> mjpegtools-1.6.2-r3.ebuild:

  fix libtool-stuff; bug #74664

  14 Nov 2004; Simon Stelling <blubb@gentoo.org> mjpegtools-1.6.2-r3.ebuild:

  fix bug #70334 with a autoreconf

  03 Nov 2004; Michael Hanselmann <hansmi@gentoo.org>

  mjpegtools-1.6.2-r3.ebuild:

  Temporary fix for the SDL-problem in bug 66927.

  23 Oct 2004; Jason Wever <weeve@gentoo.org> mjpegtools-1.6.2-r3.ebuild:

  Added ~sparc keyword.

  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org>

  mjpegtools-1.6.2-r3.ebuild:

  Stable on amd64.

  25 Sep 2004; Heinrich Wendel <lanius@gentoo.org>

  +files/mjpegtools-1.6.2-nogtk.patch, mjpegtools-1.6.2-r3.ebuild:

  mark x86

  25 Sep 2004; Heinrich Wendel <lanius@gentoo.org>

  +files/mjpegtools-1.6.2-nogtk.patch, mjpegtools-1.6.2-r3.ebuild:

  strip -fstack-protector if compiled with mmx|3dnow|sse, bug #37972

  05 Aug 2004; Luca Barbato <lu_zero@gentoo.org>

  +files/mjpegtools-1.6.2-gcc34-altivec.patch, mjpegtools-1.6.2-r3.ebuild:

  Minor fix for altivec

  26 Jun 2004; Danny van Dyk <kugelfang@gentoo.org>

  mjpegtools-1.6.2-r1.ebuild:

  Fixed BUG #55222. -fPIC neccessary for libmjpegutils.a, as it is used to

  create shared objects.

*mjpegtools-1.6.2-r3 (23 Jun 2004)

  23 Jun 2004; Mike Frysinger <vapier@gentoo.org>

  files/mjpegtools-1.6.2-fPIC.patch, -mjpegtools-1.6.2-r2.ebuild,

  +mjpegtools-1.6.2-r3.ebuild:

  Make sure the libraries get built with -fPIC otherwise people like ppc get mad

  #47335 by Heinrich Wendel.

  14 Jun 2004; Michael Hanselmann <hansmi@gentoo.org>

  +files/altivec-fix-1.6.2.patch, mjpegtools-1.6.2-r2.ebuild:

  Added a patch to fix compilation-errors on PowerPC with Altivec disabled. This

  may happen if the code is being compiled for a G3-processor (-mcpu=G3 or

  -mcpu=750). It patches the configure.in-file. Added ~ppc to KEYWORDS.

  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> mjpegtools-1.6.0-r7.ebuild,

  mjpegtools-1.6.1.90-r2.ebuild, mjpegtools-1.6.2-r1.ebuild,

  mjpegtools-1.6.2-r2.ebuild:

  Fix use invocation

*mjpegtools-1.6.2-r2 (17 May 2004)

  17 May 2004; Patrick Kursawe <phosphan@gentoo.org> metadata.xml,

  mjpegtools-1.6.2-r2.ebuild,

  Adding optional yv12 support and changing CFLAGS handling as suggested in bug

  #42414

  Corrected metadata syntax.

  17 May 2004; Patrick Kursawe <phosphan@gentoo.org>

  mjpegtools-1.6.1.90-r1.ebuild, mjpegtools-1.6.1.91.ebuild,

  mjpegtools-1.6.1.92.ebuild, mjpegtools-1.6.1.93.ebuild,

  mjpegtools-1.6.1.ebuild, mjpegtools-1.6.2.ebuild:

  Big cleanup.

  12 May 2004; Alexander Gabert <pappy@gentoo.org> mjpegtools-1.6.2-r1.ebuild:

  added new hardened PIE SSP switches

  12 May 2004; Alexander Gabert <pappy@gentoo.org>

  mjpegtools-1.6.1.90-r1.ebuild, mjpegtools-1.6.1.90-r2.ebuild,

  mjpegtools-1.6.1.91.ebuild, mjpegtools-1.6.1.92.ebuild,

  mjpegtools-1.6.1.93.ebuild, mjpegtools-1.6.2.ebuild:

  removed hardened-gcc logic, added filter-flags fPIC logic

  28 Apr 2004; Travis Tilley <lv@gentoo.org>

  +files/mjpegtools-1.6.2-gcc34.patch, mjpegtools-1.6.2-r1.ebuild:

  added fix for compiling with gcc 3.4. thanks go to Igor V. Kovanlenko and

  "LordKow". MOOOO!

  27 Apr 2004; Aron Griffis <agriffis@gentoo.org>

  mjpegtools-1.6.1.90-r1.ebuild, mjpegtools-1.6.1.90-r2.ebuild,

  mjpegtools-1.6.1.91.ebuild, mjpegtools-1.6.1.92.ebuild,

  mjpegtools-1.6.1.93.ebuild:

  Add inherit eutils

  26 Apr 2004; Aron Griffis <agriffis@gentoo.org>

  mjpegtools-1.6.1.90-r1.ebuild, mjpegtools-1.6.1.90-r2.ebuild,

  mjpegtools-1.6.1.91.ebuild, mjpegtools-1.6.1.92.ebuild,

  mjpegtools-1.6.1.93.ebuild:

  Add die following econf for bug 48950

  19 Apr 2004; Martin Holzer <mholzer@gentoo.org> mjpegtools-1.6.2-r1.ebuild:

  fixing via ezra. closes 48160

  15 Apr 2004; Scott W Taylor <swtaylor@gentoo.org>

  mjpegtools-1.6.2-r1.ebuild:

  More universal check for hardened

  29 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>;

  mjpegtools-1.6.0-r7.ebuild, mjpegtools-1.6.1.90-r1.ebuild,

  mjpegtools-1.6.1.90-r2.ebuild, mjpegtools-1.6.1.91.ebuild,

  mjpegtools-1.6.1.92.ebuild, mjpegtools-1.6.1.93.ebuild,

  mjpegtools-1.6.1.ebuild, mjpegtools-1.6.2-r1.ebuild,

  mjpegtools-1.6.2.ebuild:

  Change x11-base/xfree dependency to virtual/x11.

  18 Mar 2004; Patrick Kursawe <phosphan@gentoo.org>

  mjpegtools-1.6.2-r1.ebuild:

  Updating dependencies because of bug #38665

  18 Mar 2004; Patrick Kursawe <phosphan@gentoo.org>

  mjpegtools-1.6.2-r1.ebuild:

  Added the patch to the latest version aswell, see bug #44645

  17 Mar 2004; Patrick Kursawe <phosphan@gentoo.org>

  mjpegtools-1.6.1.93.ebuild, files/no-x11-lib-2.patch:

  Adding no-x11-lib patch, see bug #36771

  17 Mar 2004; Patrick Kursawe <phosphan@gentoo.org>

  mjpegtools-1.6.1.90-r2.ebuild:

  The no-x11-lib.patch should be only applied when not using X, see bug #42037.

*mjpegtools-1.6.2-r1 (15 Mar 2004)

*mjpegtools-1.6.1.90-r2 (15 Mar 2004)

  15 Mar 2004; Patrick Kursawe <phosphan@gentoo.org>

  mjpegtools-1.6.2-r1.ebuild, mjpegtools-1.6.1.90-r2.ebuild:

  Adding missing info directory entries (bug #38459).

  24 Feb 2004; Martin Holzer <mholzer@gentoo.org>

  files/mjpegtools-1.6.1.92-fPIC.patch, files/mjpegtools-1.6.1.93-fPIC.patch:

  adding fPIC patches. Closes 39268.

*mjpegtools-1.6.2 (05 Feb 2004)

  05 Feb 2004; Martin Holzer <mholzer@gentoo.org> mjpegtools-1.6.2.ebuild:

  Version bumped.

*mjpegtools-1.6.1.93 (18 Jan 2004)

  18 Jan 2004; Martin Holzer <mholzer@gentoo.org> mjpegtools-1.6.1.93.ebuild:

  Version bumped.

  17 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org>

  mjpegtools-1.6.0-r7.ebuild:

  set ppc in keywords

*mjpegtools-1.6.1.92 (16 Jan 2004)

  16 Jan 2004; Wout Mertens <wmertens@gentoo.org> mjpegtools-1.6.1.92.ebuild:

  Version bump and disabling -fPIC on x86 where it fails. Also first go at

  making it work for Via C3-I chips (That don't have the cmov instruction)

  Closing #37133, #36502 and #30345

  02 Jan 2004; Daniel Ahlberg <aliz@gentoo.org> mjpegtools-1.6.1.91.ebuild:

  Added fPIC patch to make it compile on amd64. Also updated dependencies so

  that mmx, 3dnow and sse dependencies only gets pulled in for x86. Closing

  #36843.

  28 Dec 2003; Jason Wever <weeve@gentoo.org> mjpegtools-1.6.1.90-r1.ebuild:

  Fixed ebuild so it works better with non-x86 arches. Adding ~sparc keyword as

  it compiled fine. Fixes bug #36680.

*mjpegtools-1.6.1.91 (26 Nov 2003)

  26 Nov 2003; Martin Holzer <mholzer@gentoo.org> mjpegtools-1.6.1.91.ebuild:

  Version bumped.

  14 Oct 2003; Martin Holzer <mholzer@gentoo.org>

  mjpegtools-1.6.1.90-r1.ebuild:

  updated slot. closes #30908.

  06 Oct 2003; Martin Holzer <mholzer@gentoo.org> mjpegtools-1.6.0-r7.ebuild,

  files/mjpegtools-1.6.0-gcc3.patch:

  Added gcc3 fix. Closes #25163.

  23 Sep 2003; Max Kalika <max@gentoo.org> mjpegtools-1.6.1.90-r1.ebuild:

  Forward-port the hardened-gcc fixes.

  20 Sep 2003; Alexander Gabert <pappy@gentoo.org> mjpegtools-1.6.1.90.ebuild:

  added hardened-gcc exclusion gcc flags for failing assembler

*mjpegtools-1.6.1.90-r1 (19 Sep 2003)

  19 Sep 2003; Max Kalika <max@gentoo.org> mjpegtools-1.6.1.90-r1.ebuild,

  files/no-x11-lib.patch:

  Remove dangling -lX11. Fixes bug 29070. Thanks to Christian Jiresjö for the

  patch

  19 Sep 2003; Max Kalika <max@gentoo.org> mjpegtools-1.6.1.90.ebuild:

  Less aggressive flag filtering.

  16 Sep 2003; Max Kalika <max@gentoo.org> mjpegtools-1.6.1.90.ebuild:

  Bump to stable x86.

*mjpegtools-1.6.1.90 (10 Sep 2003)

  10 Sep 2003; Max Kalika <max@gentoo.org> mjpegtools-1.6.1.90.ebuild:

  Bump to version 1.6.1.90.

  25 Aug 2003; Max Kalika <max@gentoo.org> mjpegtools-1.6.0-r7.ebuild,

  mjpegtools-1.6.1.ebuild:

  Require avifile < 0.7.38. Doesn't compile with the newest version.

  04 Aug 2003; Martin Holzer <mholzer@gentoo.org> mjpegtools-1.6.0-r7.ebuild,

  mjpegtools-1.6.1.ebuild:

  Adding more Filtering options.

  15 Jul 2003; pvdabeel <pvdabeel@gentoo.org> mjpegtools-1.6.1.ebuild:

  -ppc for now , lots of altivec troubles

  16 Jun 2003; <msterret@gentoo.org> mjpegtools-1.6.1.ebuild:

  use mirror:// in SRC_URI

  10 Jun 2003; <msterret@gentoo.org> mjpegtools-1.6.0-r7.ebuild:

  DEPEND on sed >= 4

  09 Jun 2003; Martin Holzer <mholzer@gentoo.org> mjpegtools-1.6.0-r7.ebuild:

  Added eutils which is needed for ppc. closes #19224.

  01 Jun 2003; Martin Holzer <mholzer@gentoo.org> mjpegtools-1.6.1.ebuild:

  Making gcc 2.95 compatible

  01 Jun 2003; Martin Holzer <mholzer@gentoo.org> mjpegtools-1.6.0-r7.ebuild:

  Making gcc 2.95 compatible

*mjpegtools-1.6.1 (09 Feb 2003)

  02 May 2003; Jon Portnoy <avenj@gentoo.org> mjpegtools-1.6.1.ebuild :

  Made gtk-1.2 an optional dependency to fix bug #19804.

  09 Feb 2003; Martin Holzer <mholzer@gentoo.org> mjpegtools-1.6.1.ebuild

  files/digest-mjpegtools-1.6.1 ChangeLog :

  Version bumped. Submitted by mathewalexander@surewest.net in #10970.

*mjpegtools-1.6.0-r7 (27 Dec 2002)

  29 Apr 2003; Martin Holzer <mholzer@gentoo.org> mjpegtools-1.6.0-r7.ebuild:

  Adding filtering. Closes #16238.

  01 Mar 2003; Jason Wever <weeve@gentoo.org> mjpegtools-1.6.0-r7.ebuild:

  Added ~sparc to keywords.

  22 Feb 2003; Aron Griffis <agriffis@gentoo.org> mjpegtools-1.6.0-r7.ebuild :

  Fix problem in SRC_URI... see bug 16159

  21 Feb 2003; Aron Griffis <agriffis@gentoo.org> mjpegtools-1.6.0-r7.ebuild :

  Disable quicktime support on alpha, where it doesn't build.

  Mark stable on alpha in support of Gnome 2.2.

  20 Feb 2003; Aron Griffis <agriffis@gentoo.org> mjpegtools-1.6.0-r7.ebuild :

  Make svgalib dependent on USE=svga.  This isn't really the best

  fix because it's actually libsdl that depends on svgalib, but it

  will do for the moment.  Add ~alpha to KEYWORDS and fix a couple

  niglets in the ebuild.

  18 Feb 2003; Martin Holzer <mholzer@gentoo.org> mjpegtools-1.6.0-r7 :

  Added svgalib to DEPEND. Closes #15876.

  10 Feb 2003; Mark Guertin <gerk@gentoo.org> mjpegtools-1.6.0-r7.ebuild

  files/1.6.0-r7-ppc.patch:

  Added patch to close bug #15441, thanks go to Lapo Calamandrei.

  09 Feb 2003; Martin Holzer <mholzer@gentoo.org> mjpegtools-1.6.0-r7.ebuild :

  Marked as stable for x86. 

  27 Dec 2002; Martin Schlemmer <azarah@gentoo.org> mjpegtools-1.6.0-r7.ebuild :

  Moved elibtoolize to src_compile.  Remove the unneeded 'if then fi' 's for

  the 'mmx' 'sse' and '3dnow' USE flags in [R]DEPEND, as they are already

  in [R]DEPEND ...

*mjpegtools-1.6.0-r6 (03 Dec 2002)

  18 Feb 2003; Martin Holzer <mholzer@gentoo.org> mjpegtools-1.6.0-r6 :

  Added svgalib to DEPEND. Closes #15876.

  03 Dec 2002; Jon Nall <nall@gentoo.org> mjpegtools-1.6.0-r6.ebuild :

  I didn't create this version. there was no ChangeLog entry for -r6

  (though i think phoen][x's comment from 25 Nov 2002 refers to -r6.)

  I added ~ppc and made libmovtar mmx-dependent

*mjpegtools-1.6.0-r5 (d1814 Nov 2002)

  18 Feb 2003; Martin Holzer <mholzer@gentoo.org> mjpegtools-1.6.0-r5 :

  Added svgalib to DEPEND. Closes #15876.

  25 Nov 2002; phoen][x <phoenix@gentoo.org>  mjpegtools-1.6.0-r5 :

  Fixed a really evil bug which caused mjpegtools to fail in lavtools/

  when merged with USE="quicktime" - the problem comes down to this:

  lav_common.c and lav_io.c both use "dv_decoder_new(0,0,0);" which is

  wrong because dv_decoder_new() doesn't take any arguments. I used sed

  to work around that - it should work flawlessy now. This fixes bug #11163.

  14 Nov 2002; Matthew Kennedy <mkennedy@gentoo.org>

  mjpegtools-1.6.0-r5.ebuild files/digest-mjpegtools-1.6.0-r5, ChangeLog : 

  Filter compiler flags. Resolves bug #10962

*mjpegtools-1.6.0-r4 (14 Nov 2002)

  14 Nov 2002; Seemant Kulleen <seemant@gentoo.org>

  mjpegtools-1.6.0-r4.ebuild files/digest-mjpegtools-1.6.0-r4 :

  Added avifile as a dependency (based on "avi" USE flag), so that it

  installs lav2divx utilities as well. Closes bug #10516 by

  ajacoutot@lphp.org (ajacoutot)

*mjpegtools-1.6.0-r3 (26 Jul 2002)

  30 Aug 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :

  Add missing deps on libdv and arts (tha latter one is optional); see

  bug #7081.

  26 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> mjpegtools-1.6.0-r3.ebuild :

  Closes #4702. Also added nasm to dependancy list (if 3dnow, sse or mmx are in USE)

  to make mjpegtools more optimized.

*mjpegtools-1.6.0-r2 (08 Jul 2002)

  08 Jul 2002; Spider <spider@gentoo.org> mjpegtools-1.6.0-r2.ebuild :

  fixed remnants of ${D} in .la files

*mjpegtools-1.6.0-r1 (30 May 2002)

  30 May 2002; Seemant Kulleen <seemant@gentoo.org>

  mjpegtools-1.6.0-r1.ebuild files/digest-mjpegtools-1.6.0-r1 :

  Fixed some dependency information, thanks to: aliz@telia.com (Daniel

  Ahlberg) in bug #3108

*mjpegtools-1.6.0 (26 May 2002)

  26 May 2002; Seemant Kulleen <seemant@gentoo.org> mjpegtools-1.6.0.ebuild

  files/digest-mjpegtools-1.6.0 :

  Version bump to newest stable

*mjpegtools-1.5.20011611-r2 (12 Apr 2002)

  12 Apr 2002; Spider <spider@gentoo.org>

  Updating dependency for libpng 1.2.1

*mjpegtools-1.5.20011611-r1 (12 Apr 2002)

  12 Apr 2002; Seemant Kulleen <seemant@gentoo.org> 

  mjpegtools-1.5.20011611-r1.ebuild :

  Changed avifile USE flag to avi USE flag instead and cleaned up ebuild

  a little.

*mjpegtools-1.5.20011611-r1 (1 Feb 2002)

  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :  

  Added initial ChangeLog which should be updated whenever the package is

  updated in any way. This changelog is targetted to users. This means that the

  comments should well explained and written in clean English. The details about

  writing correct changelogs are explained in the skel.ChangeLog file which you

  can find in the root directory of the portage repository.

AUX mjpegtools-1.8.0-as-needed.patch 1015 RMD160 10c6f59d6a30c33d9ce18eab603b7faca5f238f6 SHA1 82c76d7caae15360ab11835b6667f63cfa8f2c89 SHA256 ee21d2d19e3eaa446d0c6708f496ea9b485da51d487863ea198c04d991e2a2b6

AUX mjpegtools-1.8.0-fix-lav2mpeg.patch 1092 RMD160 50b58be0662d7a004f712f942cae94a0c2caaa3f SHA1 49ba0dc9483e750edabb355042b89124bab95101 SHA256 8d9a19106b3fe3e64f238c1aa0008a584cb792c9f783995eea18bbd4ffa605b6

AUX mjpegtools-1.8.0-gcc41.patch 420 RMD160 e48e6d716f21e450cc26e7039c703005ed9a0bd9 SHA1 b1bd9604fa0eb6c8b54ee9d0836b0c61b233ffff SHA256 5e748deceb1af3179025ab42d274cc2941fe85bb0b7b512b49263a9ff6754446

AUX mjpegtools-1.8.0-glibc-2.10.patch 429 RMD160 477cefb02eae1d6b2a1e6f5a75977d49d482035e SHA1 2f9a7a6bb1712de60fc8750ee436de775b4fb820 SHA256 a5966e12b5da5c9beae0878642b30a2b58b74e713bac621ca767ec3ea63e7fff

AUX mjpegtools-1.8.0-lavrec-memleak.patch 2473 RMD160 fd6a6627659ab50f48d9f5c3d41c5239ed750820 SHA1 b9ced8e381bb6f8a2b407368e779640b278d226d SHA256 2256ebdbf69429d038908aef1d1e538c68f3d78318783ef57fb27845abf9875f

AUX mjpegtools-1.8.0-libc.patch 5515 RMD160 03ab695826ac6676c6e6f5bb1f5c2784eaff43d5 SHA1 cf03a43c25e7d4788a6dbff78fc8e89adf8560ed SHA256 02c7aef7d237d1af5bb86a4cca3194b71698e99d1250e44052d2fd9cb0560e06

AUX mjpegtools-1.8.0-libquicktime.patch 1186 RMD160 125fe4cfdecb5b98480d45670e3cb6d84f894c4f SHA1 205138f34d665174cb8f323669b8aa0ee4eb7785 SHA256 abf3043efbcdb29af2ee1b2a2e0b92b948a740d377d8e534635eb8599e6fb386

AUX mjpegtools-1.8.0-no-jpeg-mmx.patch 1539 RMD160 eb2b1756e65ce56b128e0c6763a27253d5cd9d4c SHA1 09e6c05a4c277498c277b9480d4f51c29e707b0c SHA256 f748ee564a03473ea027ab69d08fe1e25ab6ff05cbf4f223fefa657f1cd3e3aa

AUX mjpegtools-1.8.0-parallelmake.patch 829 RMD160 107cbf908041da6233a8b7340df0caff90cec253 SHA1 97de494ba20a164d06a02f6a5f869e971b8e2b0f SHA256 78e4f3288544a1e7f0733b70136f82a9927017fcde1efaa1a8b659be1f37c288

AUX mjpegtools-1.8.0-pkg-config.patch 423 RMD160 2d3d55fb7561a9c0ceeb7ce880953cb12662489c SHA1 5d284a7754816a5e48e364f512f1f1fe71b58e00 SHA256 3b26122803c1ea805534308137323ee119fbc29777fa4a588ebe6dade0a8d490

AUX mjpegtools-1.9.0-glibc-2.10.patch 429 RMD160 ef7f706aeda7ebfa04dbd43b70a5e3e6faf24610 SHA1 3029f0e835e693b144298ed9f8143c9566be26f3 SHA256 0a76b418df4daa1603c827001ede6a1b3da4457b5d3aefeda0a656cd88ad446b

AUX mjpegtools-1.9.0-jpeg-7.patch 774 RMD160 22c50dd28617159eaa89aefb4647e21d4d9972e7 SHA1 2bdb1b3b8591cede11d4a133a758e8ead35db4dd SHA256 2c9b90a283e8e6d95bd9573cd16310107c654d0d701a7dff7e47ee1a773da7cf

DIST mjpegtools-1.8.0.tar.gz 1475998 RMD160 4d97a6a721f29223975605e2a5e645b4d7d129b5 SHA1 e11d68298a64b52f98724dbf3fd14f168e140290 SHA256 d841575c72cd0e587c1bab703d0906e3d23bf428424000557739cf5d6097209a

DIST mjpegtools-1.9.0.tar.gz 1718063 RMD160 79e0eb4bce468bb8f12da336e29abe8fab390a5f SHA1 1701233354c7ea86b5b7808c4dd5d03a71118e48 SHA256 a9322aaab1e0835fbaa00fc10e58e885833454fa0ad6f57c60c89a78f7ed1711

DIST mjpegtools-m4-1.tar.bz2 4547 RMD160 b81b89bb6364023606a1d3ca9519e143fe053ab4 SHA1 4c69f9918dcc56fc544fef9af9aaed968da1ae67 SHA256 10de1e206ee9c84aae111e95f655ad9394be749bfed01d337f7ff9a983aab522

EBUILD mjpegtools-1.8.0-r2.ebuild 2880 RMD160 299aa207ae34c594a5bc8406dc557d86cede7194 SHA1 0e1b6da3472e448007d739f7f6bee140c4c837e0 SHA256 c0a57f6d2c725be7bcdd14b2f64fb7d742bd38a705a7206051d5a027221ac6c6

EBUILD mjpegtools-1.9.0-r1.ebuild 2150 RMD160 13a84a81bc4d1deb680c4c3cc53def3232fd3546 SHA1 efca080755aedfc37602f8c9f257d22ca5d032b2 SHA256 4e3cb6e36bcc7628f2466873cb51dfd8ccb208496b1ca7233463547b714510da

EBUILD mjpegtools-1.9.0.ebuild 2113 RMD160 3a3dbe661cba9c59c9f451c1a4fd348a569a2ca8 SHA1 edd1de8894068d44773628e9aa55dca3f4786f23 SHA256 1c8c5c5a751efbb7cdb50254896123c5cdc67ca5d607abe92fb4ff4b84c1d971

MISC ChangeLog 26011 RMD160 d202cc58271dd81acef7cdab5047e30103f761fd SHA1 c73aa6b3cbd5d93ded636ba44de7e1b04eea1445 SHA256 ae6c8c939932296b4bb35de2b777672ef08cab4bdf39275d911c5998881d1677

MISC metadata.xml 415 RMD160 cdbf5de3ece63e3df10d1a4e69ed5e471abb84fa SHA1 5ae767eb57a50fff79f938a01332e67f88306aff SHA256 75cf2c90452ef1a74f46812e6ffee8c2f25a979f3a0b8e366032ee60bdb8663b

diff -ru mjpegtools-1.8.0-orig/lavtools/Makefile.am mjpegtools-1.8.0/lavtools/Makefile.am

--- mjpegtools-1.8.0-orig/lavtools/Makefile.am	2006-08-25 15:09:51.542109878 +0200

+++ mjpegtools-1.8.0/lavtools/Makefile.am	2006-08-25 15:11:37.920337695 +0200

@@ -51,10 +51,17 @@

 liblavrec_la_SOURCES = liblavrec.c audiolib.c frequencies.c

 liblavrec_la_CPPFLAGS = $(AM_CPPFLAGS) # so automake doesn't complain about audiolib & frequencies

 liblavrec_la_LDFLAGS = $(LAV_ALL_LIB_OPTS)

+liblavrec_la_LIBADD = -llavfile -llavjpeg

+liblavrec_la_DEPENDENCIES = liblavfile.la liblavjpeg.la

 liblavplay_la_SOURCES = liblavplay.c audiolib.c

 liblavplay_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDV_CFLAGS) $(X_CFLAGS)

 liblavplay_la_LDFLAGS = $(LAV_ALL_LIB_OPTS)

+liblavplay_la_LIBADD = -llavfile $(SDL_LIBS) -llavjpeg

+liblavplay_la_DEPENDENCIES = liblavfile.la liblavjpeg.la

+if HAVE_X

+  liblavplay_la_LIBADD += $(X_LIBS) -lX11

+endif

 # *********************************************************************

 # The tools themselves

diff -ru mjpegtools-1.8.0-orig/scripts/lav2mpeg mjpegtools-1.8.0-fixed-lav2mpeg/scripts/lav2mpeg

--- mjpegtools-1.8.0-orig/scripts/lav2mpeg	2006-11-19 17:11:41.000000000 +0100

+++ mjpegtools-1.8.0-fixed-lav2mpeg/scripts/lav2mpeg	2006-11-19 18:28:32.000000000 +0100

@@ -253,7 +253,7 @@

     esac

 done

 let MOPTIND=OPTIND-LAVRC_COUNT

-shift `expr $MOPTIND-1`

+shift $((MOPTIND-1))

 if [ "${QUIETLOG}" != "" ]; then

    logfile=${QUIETLOG}

@@ -267,7 +267,8 @@

 # lavinfo should set up video_frames, video_width

 # video_height, video_inter, video_norm, audio_chans

-eval $($LAVINFO $@ | grep "=")  # grep for = to remove Warnings

+# Add backslashes to protect contained spaces

+eval $($LAVINFO $@ | grep "=" | sed -e 's: :\\ :g')  # grep for = to remove Warnings

 if [ "$video_frames" == "" ]; then

    logIt "'lavinfo $@' died! exiting"

    logIt " maybe you don't have lavinfo. or your input flags were wrong"

@@ -401,7 +402,7 @@

    fi

 fi

-if [ $video_inter -eq 1 ]; then

+if [[ ${video_inter/interlacing/} != ${video_inter} ]]; then

    yuvdenoise_flags="$yuvdenoise_flags -F"

 fi

diff -ur mjpegtools-1.8.0-orig/y4mdenoise/Region2D.hh mjpegtools-1.8.0/y4mdenoise/Region2D.hh

--- mjpegtools-1.8.0-orig/y4mdenoise/Region2D.hh	2005-12-19 12:36:54.000000000 +0300

+++ mjpegtools-1.8.0/y4mdenoise/Region2D.hh	2005-12-19 12:44:36.000000000 +0300

@@ -16,7 +16,7 @@

 #include "Status_t.h"

 #include <iostream>

-

+#include <cassert>

 // The 2-dimensional region class.  Parameterized by the numeric type

--- mjpegtools-1.8.0/mplex/lpcmstrm_in.cpp.orig	2009-08-27 14:27:01.000000000 -0500

+++ mjpegtools-1.8.0/mplex/lpcmstrm_in.cpp	2009-08-27 14:28:04.000000000 -0500

@@ -53,7 +53,7 @@

 bool LPCMStream::Probe(IBitStream &bs )

 {

-    char *last_dot = strrchr( bs.StreamName(), '.' );

+    const char *last_dot = strrchr( bs.StreamName(), '.' );

     return 

         last_dot != NULL 

         && strcmp( last_dot+1, "lpcm") == 0;

--- mjpegtools-1.8.0/lavtools/lav_io.c	2005-08-27 13:47:20.000000000 +0200

+++ mjpegtools-1.8.0___fixed/lavtools/lav_io.c	2006-05-14 05:45:48.000000000 +0200

@@ -540,15 +540,12 @@

 int lav_write_audio(lav_file_t *lav_file, uint8_t *buff, long samps)

 {

-   int res;

+   int res = -1;

 #ifdef HAVE_LIBQUICKTIME

    int i, j;

-   int16_t *qt_audio = (int16_t *)buff, **qt_audion;

+   int16_t *buff16 = (int16_t *)buff, **qt_audion;

    int channels = lav_audio_channels(lav_file);

-

-   qt_audion = malloc(channels * sizeof (int16_t **));

-   for (i = 0; i < channels; i++)

-	qt_audion[i] = (int16_t *)malloc(samps * lav_file->bps);

+   int bits = lav_audio_bits(lav_file);

 #endif

    video_format = lav_file->format; internal_error = 0; /* for error messages */

@@ -557,24 +554,43 @@

    {

       case 'a':

       case 'A':

-         res = AVI_write_audio( lav_file->avi_fd, buff, samps*lav_file->bps);

+         res = AVI_write_audio(lav_file->avi_fd, buff, samps*lav_file->bps);

          break;

 #ifdef HAVE_LIBQUICKTIME

       case 'q':

-	/* Deinterleave the audio into the two channels. */

-	for (i = 0; i < samps; i++)

-	    {

-	    for (j = 0; j < channels; j++)

-		qt_audion[j][i] = qt_audio[(channels*i) + j];

-	    }

-	res = lqt_encode_audio_track(lav_file->qt_fd, qt_audion, NULL,samps,0);

-	for (j = 0; j < channels; j++)

-	    free(qt_audion[j]);

-	free(qt_audion);

-        break;

+	 if (bits != 16 || channels > 1)

+	 {

+	    /* Deinterleave the audio into the two channels and/or convert

+	     * bits per sample to the required format.

+	     */

+	    qt_audion = malloc(channels * sizeof(*qt_audion));

+	    for (i = 0; i < channels; i++)

+	      qt_audion[i] = malloc(samps * sizeof(**qt_audion));

+

+	    if (bits == 16)