mirror of
https://github.com/mpv-player/mpv
synced 2025-02-01 20:52:05 +00:00
_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
This commit is contained in:
parent
97c8a09406
commit
d653bc6138
@ -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;
|
||||
|
24
tremor/block.h
Normal file
24
tremor/block.h
Normal file
@ -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
|
@ -25,6 +25,7 @@
|
||||
#include "codebook.h"
|
||||
#include "misc.h"
|
||||
#include "os.h"
|
||||
#include "block.h"
|
||||
|
||||
#define LSP_FRACBITS 14
|
||||
|
||||
|
@ -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 */
|
||||
|
||||
|
@ -25,6 +25,7 @@
|
||||
#include "codebook.h"
|
||||
#include "misc.h"
|
||||
#include "os.h"
|
||||
#include "block.h"
|
||||
|
||||
typedef struct {
|
||||
vorbis_info_residue0 *info;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user