[MPlayer-cvslog] r24824 - in trunk/tremor: block.c block.h floor0.c floor1.c res012.c synthesis.c tremor.diff
diego
subversion at mplayerhq.hu
Sun Oct 21 00:41:24 CEST 2007
Author: diego
Date: Sun Oct 21 00:41:24 2007
New Revision: 24824
Log:
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
Add a header file with the function prototype to address this issue.
This has the positive side effect of fixing a couple of implicit
declaration warnings.
The problem was originally reported as Debian bug 447278.
patch by Dann Frazier and Andrea Mennucci, mennucc1 debian org
Added:
trunk/tremor/block.h
Modified:
trunk/tremor/block.c
trunk/tremor/floor0.c
trunk/tremor/floor1.c
trunk/tremor/res012.c
trunk/tremor/synthesis.c
trunk/tremor/tremor.diff
Modified: trunk/tremor/block.c
==============================================================================
--- trunk/tremor/block.c (original)
+++ trunk/tremor/block.c Sun Oct 21 00:41:24 2007
@@ -25,6 +25,7 @@
#include "window.h"
#include "registry.h"
#include "misc.h"
+#include "block.h"
static int ilog(unsigned int v){
int ret=0;
Added: trunk/tremor/block.h
==============================================================================
--- (empty file)
+++ trunk/tremor/block.h Sun Oct 21 00:41:24 2007
@@ -0,0 +1,24 @@
+/********************************************************************
+ * *
+ * THIS FILE IS PART OF THE OggVorbis 'TREMOR' CODEC SOURCE CODE. *
+ * *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * *
+ * THE OggVorbis 'TREMOR' SOURCE CODE IS (C) COPYRIGHT 1994-2002 *
+ * BY THE Xiph.Org FOUNDATION http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+ function: basic shared block operations
+
+ ********************************************************************/
+
+#ifndef _V_BLOCK_H_
+#define _V_BLOCK_H_
+
+void *_vorbis_block_alloc(vorbis_block *vb,long bytes);
+void _vorbis_block_ripcord(vorbis_block *vb);
+
+#endif
Modified: trunk/tremor/floor0.c
==============================================================================
--- trunk/tremor/floor0.c (original)
+++ trunk/tremor/floor0.c Sun Oct 21 00:41:24 2007
@@ -25,6 +25,7 @@
#include "codebook.h"
#include "misc.h"
#include "os.h"
+#include "block.h"
#define LSP_FRACBITS 14
Modified: trunk/tremor/floor1.c
==============================================================================
--- trunk/tremor/floor1.c (original)
+++ trunk/tremor/floor1.c Sun Oct 21 00:41:24 2007
@@ -24,6 +24,7 @@
#include "registry.h"
#include "codebook.h"
#include "misc.h"
+#include "block.h"
#define floor1_rangedB 140 /* floor 1 fixed at -140dB to 0dB range */
Modified: trunk/tremor/res012.c
==============================================================================
--- trunk/tremor/res012.c (original)
+++ trunk/tremor/res012.c Sun Oct 21 00:41:24 2007
@@ -25,6 +25,7 @@
#include "codebook.h"
#include "misc.h"
#include "os.h"
+#include "block.h"
typedef struct {
vorbis_info_residue0 *info;
Modified: trunk/tremor/synthesis.c
==============================================================================
--- trunk/tremor/synthesis.c (original)
+++ trunk/tremor/synthesis.c Sun Oct 21 00:41:24 2007
@@ -23,6 +23,7 @@
#include "registry.h"
#include "misc.h"
#include "os.h"
+#include "block.h"
int vorbis_synthesis(vorbis_block *vb,ogg_packet *op){
vorbis_dsp_state *vd=vb->vd;
Modified: trunk/tremor/tremor.diff
==============================================================================
--- trunk/tremor/tremor.diff (original)
+++ trunk/tremor/tremor.diff Sun Oct 21 00:41:24 2007
@@ -107,3 +107,80 @@
int val=VFLOAT_MULTI(delta,delpoint,
abs(b->quantlist[j*b->dim+k]),&point);
+--- block.h (revision 0)
++++ block.h (revision 0)
+@@ -0,0 +1,24 @@
++/********************************************************************
++ * *
++ * THIS FILE IS PART OF THE OggVorbis 'TREMOR' CODEC SOURCE CODE. *
++ * *
++ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
++ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
++ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
++ * *
++ * THE OggVorbis 'TREMOR' SOURCE CODE IS (C) COPYRIGHT 1994-2002 *
++ * BY THE Xiph.Org FOUNDATION http://www.xiph.org/ *
++ * *
++ ********************************************************************
++
++ function: basic shared block operations
++
++ ********************************************************************/
++
++#ifndef _V_BLOCK_H_
++#define _V_BLOCK_H_
++
++void *_vorbis_block_alloc(vorbis_block *vb,long bytes);
++void _vorbis_block_ripcord(vorbis_block *vb);
++
++#endif
+--- floor0.c (revision 24821)
++++ floor0.c (working copy)
+@@ -25,6 +25,7 @@
+ #include "codebook.h"
+ #include "misc.h"
+ #include "os.h"
++#include "block.h"
+
+ #define LSP_FRACBITS 14
+
+--- floor1.c (revision 24821)
++++ floor1.c (working copy)
+@@ -24,6 +24,7 @@
+ #include "registry.h"
+ #include "codebook.h"
+ #include "misc.h"
++#include "block.h"
+
+ #define floor1_rangedB 140 /* floor 1 fixed at -140dB to 0dB range */
+
+--- synthesis.c (revision 24821)
++++ synthesis.c (working copy)
+@@ -23,6 +23,7 @@
+ #include "registry.h"
+ #include "misc.h"
+ #include "os.h"
++#include "block.h"
+
+ int vorbis_synthesis(vorbis_block *vb,ogg_packet *op){
+ vorbis_dsp_state *vd=vb->vd;
+--- res012.c (revision 24821)
++++ res012.c (working copy)
+@@ -25,6 +25,7 @@
+ #include "codebook.h"
+ #include "misc.h"
+ #include "os.h"
++#include "block.h"
+
+ typedef struct {
+ vorbis_info_residue0 *info;
+--- block.c (revision 24821)
++++ block.c (working copy)
+@@ -25,6 +25,7 @@
+ #include "window.h"
+ #include "registry.h"
+ #include "misc.h"
++#include "block.h"
+
+ static int ilog(unsigned int v){
+ int ret=0;
More information about the MPlayer-cvslog
mailing list