Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 498824 - liboggplay update - r=roc

Browse Source
This commit is contained in:
Chris Double 2009-06-19 15:16:52 +12:00
parent fed173ce79
commit 23e5eecd67
4 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
media/liboggplay/README_MOZILLA
View File

@ -40,3 +40,4 @@ bug495129b.patch: Fix from liboggplay commit 3602bf.
bug487519.patch: Fix for bug 487519.
bug498815.patch: Fix for bug 498815.
bug498824.patch: Fix for bug 498824.

32
media/liboggplay/bug498824.patch Normal file
View File

@ -0,0 +1,32 @@
diff --git a/media/liboggplay/src/liboggplay/oggplay_callback.c b/media/liboggplay/src/liboggplay/oggplay_callback.c
index b046618..5f4ab31 100644
--- a/media/liboggplay/src/liboggplay/oggplay_callback.c
+++ b/media/liboggplay/src/liboggplay/oggplay_callback.c
@@ -642,15 +642,15 @@ oggplay_callback_predetected (OGGZ *oggz, ogg_packet *op, long serialno,
*/
for (i = 0; i < me->num_tracks; i++) {
if (serialno == me->decode_data[i]->serialno) {
-
+ int ret = 0;
me->all_tracks_initialised = 1;
/*
* call appropriate callback
*/
if (callbacks[content_type].callback != NULL) {
- callbacks[content_type].callback(oggz, op, serialno,
- me->decode_data[i]);
+ ret = callbacks[content_type].callback(oggz, op, serialno,
+ me->decode_data[i]);
}
/*
@@ -668,7 +668,7 @@ oggplay_callback_predetected (OGGZ *oggz, ogg_packet *op, long serialno,
*/
oggz_set_read_callback (me->oggz, -1, NULL, NULL);
- return 0;
+ return ret < 0 ? OGGZ_ERR_HOLE_IN_DATA : ret;
}
}

7
media/liboggplay/src/liboggplay/oggplay_callback.c
View File

@ -644,13 +644,14 @@ oggplay_callback_predetected (OGGZ *oggz, ogg_packet *op, long serialno,
*/
for (i = 0; i < me->num_tracks; i++) {
if (serialno == me->decode_data[i]->serialno) {
int ret = 0;
/*
* call appropriate callback
*/
if (callbacks[content_type].callback != NULL) {
callbacks[content_type].callback(oggz, op, serialno,
me->decode_data[i]);
ret = callbacks[content_type].callback(oggz, op, serialno,
me->decode_data[i]);
}
if
@ -677,7 +678,7 @@ oggplay_callback_predetected (OGGZ *oggz, ogg_packet *op, long serialno,
me->all_tracks_initialised = 1;
}
return 0;
return ret < 0 ? OGGZ_ERR_HOLE_IN_DATA : ret;
}
}

1
media/liboggplay/update.sh
View File

@ -60,4 +60,5 @@ patch -p3 < bug495129a.patch
patch -p3 < bug495129b.patch
patch -p3 < bug487519.patch
patch -p3 < bug498815.patch
patch -p3 < bug498824.patch
patch -p3 < bug496529.patch