nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 518952 - Remove unnecessary local patch against libvorbis. r=chris.double

Browse source 
--HG--
extra : rebase_source : 0c0703cf36a14a5d9d055a860abf8b4197f20d03
This commit is contained in:
Matthew Gregan 2009-10-05 11:56:08 +13:00
parent 3c4419b7c9
commit 52ac038bed
5 changed files with 2 additions and 75 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

1
media/libvorbis/README_MOZILLA
View file

@ -9,6 +9,5 @@ Some files are renamed during the copy to prevent clashes with object
file names with other Mozilla libraries.
alloca.diff - Bug 469639 - Failed to build firefox trunk on OpenSolaris
bug481601.patch is appled to fix bug 481601.
bug487519.patch: fix for bug 487519.
bug498855.patch: fix for bug 498855

68
media/libvorbis/bug481601.patch
View file

@ -1,68 +0,0 @@
diff --git a/media/libvorbis/include/vorbis/codec.h b/media/libvorbis/include/vorbis/codec.h
index b23fe0a..c62b2d5 100644
--- a/media/libvorbis/include/vorbis/codec.h
+++ b/media/libvorbis/include/vorbis/codec.h
@@ -170,18 +170,19 @@ extern void vorbis_comment_add(vorbis_comment *vc, char *comment);
extern void vorbis_comment_add_tag(vorbis_comment *vc,
const char *tag, const char *contents);
extern char *vorbis_comment_query(vorbis_comment *vc, const char *tag, int count);
extern int vorbis_comment_query_count(vorbis_comment *vc, const char *tag);
extern void vorbis_comment_clear(vorbis_comment *vc);
extern int vorbis_block_init(vorbis_dsp_state *v, vorbis_block *vb);
extern int vorbis_block_clear(vorbis_block *vb);
+extern void vorbis_dsp_init(vorbis_dsp_state *v);
extern void vorbis_dsp_clear(vorbis_dsp_state *v);
extern double vorbis_granule_time(vorbis_dsp_state *v,
ogg_int64_t granulepos);
extern const char *vorbis_version_string(void);
/* Vorbis PRIMITIVES: analysis/DSP layer ****************************/
extern int vorbis_analysis_init(vorbis_dsp_state *v,vorbis_info *vi);
extern int vorbis_commentheader_out(vorbis_comment *vc, ogg_packet *op);
diff --git a/media/libvorbis/lib/vorbis_block.c b/media/libvorbis/lib/vorbis_block.c
index 3b6f456..d7f5974 100644
--- a/media/libvorbis/lib/vorbis_block.c
+++ b/media/libvorbis/lib/vorbis_block.c
@@ -84,18 +84,16 @@ static int ilog2(unsigned int v){
#ifndef WORD_ALIGN
#define WORD_ALIGN 8
#endif
int vorbis_block_init(vorbis_dsp_state *v, vorbis_block *vb){
int i;
memset(vb,0,sizeof(*vb));
vb->vd=v;
- vb->localalloc=0;
- vb->localstore=NULL;
if(v->analysisp){
vorbis_block_internal *vbi=
vb->internal=_ogg_calloc(1,sizeof(vorbis_block_internal));
vbi->ampmax=-9999;
for(i=0;i<PACKETBLOBS;i++){
if(i==PACKETBLOBS/2){
vbi->packetblob[i]=&vb->opb;
@@ -295,16 +293,20 @@ int vorbis_analysis_init(vorbis_dsp_state *v,vorbis_info *vi){
/* compressed audio packets start after the headers
with sequence number 3 */
v->sequence=3;
return(0);
}
+void vorbis_dsp_init(vorbis_dsp_state *v){
+ memset(v,0,sizeof(*v));
+}
+
void vorbis_dsp_clear(vorbis_dsp_state *v){
int i;
if(v){
vorbis_info *vi=v->vi;
codec_setup_info *ci=(vi?vi->codec_setup:NULL);
private_state *b=v->backend_state;
if(b){

1
media/libvorbis/include/vorbis/codec.h
View file

@ -175,7 +175,6 @@ extern void vorbis_comment_clear(vorbis_comment *vc);
extern int vorbis_block_init(vorbis_dsp_state *v, vorbis_block *vb);
extern int vorbis_block_clear(vorbis_block *vb);
extern void vorbis_dsp_init(vorbis_dsp_state *v);
extern void vorbis_dsp_clear(vorbis_dsp_state *v);
extern double vorbis_granule_time(vorbis_dsp_state *v,
ogg_int64_t granulepos);

6
media/libvorbis/lib/vorbis_block.c
View file

@ -89,6 +89,8 @@ int vorbis_block_init(vorbis_dsp_state *v, vorbis_block *vb){
int i;
memset(vb,0,sizeof(*vb));
vb->vd=v;
vb->localalloc=0;
vb->localstore=NULL;
if(v->analysisp){
vorbis_block_internal *vbi=
vb->internal=_ogg_calloc(1,sizeof(vorbis_block_internal));
@ -309,10 +311,6 @@ int vorbis_analysis_init(vorbis_dsp_state *v,vorbis_info *vi){
return(0);
}
void vorbis_dsp_init(vorbis_dsp_state *v){
memset(v,0,sizeof(*v));
}
void vorbis_dsp_clear(vorbis_dsp_state *v){
int i;
if(v){

1
media/libvorbis/update.sh
View file

@ -47,6 +47,5 @@ cp $1/COPYING ./COPYING
cp $1/README ./README
cp $1/AUTHORS ./AUTHORS
patch -p3 < ./alloca.diff
patch -p3 <./bug481601.patch
patch -p3 <bug487519.patch
patch -p3 <bug498855.patch