rpms/vorbis-tools/F-7 vorbis-tools-svn20070412-oggdec.patch, NONE, 1.1 vorbis-tools.spec, 1.28, 1.29

[Todd M. Zullinger (tmz)]

Author: tmz

Update of /cvs/extras/rpms/vorbis-tools/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25757

Modified Files:
	vorbis-tools.spec 
Added Files:
	vorbis-tools-svn20070412-oggdec.patch 
Log Message:
* Thu Oct 04 2007 Todd Zullinger <tmz at pobox.com> - 1:1.1.1.svn20070412-3
- Upstream patch to fix oggdec writing silent wav files (#244757)


vorbis-tools-svn20070412-oggdec.patch:

--- NEW FILE vorbis-tools-svn20070412-oggdec.patch ---
See https://trac.xiph.org/ticket/1209 for the bug report.  This patch comes
from: https://trac.xiph.org/changeset/13263?format=diff&new=13263

Index: /trunk/vorbis-tools/oggdec/oggdec.c
===================================================================
--- vorbis-tools/oggdec/oggdec.c (revision 12221)
+++ vorbis-tools/oggdec/oggdec.c (revision 13263)
@@ -256,4 +256,5 @@
     int bs = 0;
     char buf[8192], outbuf[8192];
+    char *p_outbuf;
     int buflen = 8192;
     unsigned int written = 0;
@@ -325,7 +326,11 @@
           /* Then permute! */
           permute_channels(buf, outbuf, ret, channels, bits/8);
-        }
-
-        if(fwrite(outbuf, 1, ret, out) != ret) {
+          p_outbuf = outbuf;
+        }
+        else {
+          p_outbuf = buf;
+        }
+
+        if(fwrite(p_outbuf, 1, ret, out) != ret) {
             fprintf(stderr, "Error writing to file: %s\n", strerror(errno));
             ov_clear(&vf);


Index: vorbis-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/vorbis-tools/F-7/vorbis-tools.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- vorbis-tools.spec	16 May 2007 17:34:31 -0000	1.28
+++ vorbis-tools.spec	5 Oct 2007 04:37:32 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: The Vorbis General Audio Compression Codec tools.
 Name:		vorbis-tools
 Version:	1.1.1.svn20070412
-Release:	2%{?dist}
+Release:	3%{?dist}
 Epoch:		1
 Group: Applications/Multimedia
 License:	GPL
@@ -10,6 +10,7 @@
 Patch0:		vorbis-tools-1.0-build.patch
 Patch1:		vorbis-tools-1.0-curlconfig.patch
 Patch2:		vorbis-tools-svn20070412-libcurl.patch
+Patch3:		vorbis-tools-svn20070412-oggdec.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Requires:	libogg >= 2:1.1
 Requires:	libvorbis >= 1:%{version} 
@@ -41,6 +42,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 autoconf
@@ -68,6 +70,9 @@
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Oct 04 2007 Todd Zullinger <tmz at pobox.com> - 1:1.1.1.svn20070412-3
+- Upstream patch to fix oggdec writing silent wav files (#244757)
+
 * Wed May 16 2007 Christopher Aillon <caillon at redhat.com> 1:1.1.1.svn20070412-2.fc7
 - Bring back support for http URLs which was broken with the previous update
   See https://bugzilla.redhat.com/240351