summaryrefslogtreecommitdiffstats
path: root/tremor
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-10-20 22:41:24 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-10-20 22:41:24 +0000
commitd653bc61382e831397acb9d974b881c474301314 (patch)
tree8af82e71f5db78eb96906ff6fb291f5f447cdb8a /tremor
parent97c8a09406208eb68a12883316ee106bdea24424 (diff)
downloadmpv-d653bc61382e831397acb9d974b881c474301314.tar.bz2
mpv-d653bc61382e831397acb9d974b881c474301314.tar.xz
_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 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24824 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'tremor')
-rw-r--r--tremor/block.c1
-rw-r--r--tremor/block.h24
-rw-r--r--tremor/floor0.c1
-rw-r--r--tremor/floor1.c1
-rw-r--r--tremor/res012.c1
-rw-r--r--tremor/synthesis.c1
-rw-r--r--tremor/tremor.diff77
7 files changed, 106 insertions, 0 deletions
diff --git a/tremor/block.c b/tremor/block.c
index 7f9c094061..81406e2a1f 100644
--- a/tremor/block.c
+++ b/tremor/block.c
@@ -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;
diff --git a/tremor/block.h b/tremor/block.h
new file mode 100644
index 0000000000..1b21227159
--- /dev/null
+++ b/tremor/block.h
@@ -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
diff --git a/tremor/floor0.c b/tremor/floor0.c
index 3ed57a561a..6d8434e8a0 100644
--- a/tremor/floor0.c
+++ b/tremor/floor0.c
@@ -25,6 +25,7 @@
#include "codebook.h"
#include "misc.h"
#include "os.h"
+#include "block.h"
#define LSP_FRACBITS 14
diff --git a/tremor/floor1.c b/tremor/floor1.c
index 21dd5bef79..80c6dd2d46 100644
--- a/tremor/floor1.c
+++ b/tremor/floor1.c
@@ -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 */
diff --git a/tremor/res012.c b/tremor/res012.c
index 56e98f3c70..e5d87e9568 100644
--- a/tremor/res012.c
+++ b/tremor/res012.c
@@ -25,6 +25,7 @@
#include "codebook.h"
#include "misc.h"
#include "os.h"
+#include "block.h"
typedef struct {
vorbis_info_residue0 *info;
diff --git a/tremor/synthesis.c b/tremor/synthesis.c
index 3d9048dfc6..6b33cfbde1 100644
--- a/tremor/synthesis.c
+++ b/tremor/synthesis.c
@@ -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;
diff --git a/tremor/tremor.diff b/tremor/tremor.diff
index 862fdbdeda..38c67596c7 100644
--- a/tremor/tremor.diff
+++ b/tremor/tremor.diff
@@ -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;