Bug 498815 - liboggplay update - r=wiking rs=roc

This commit is contained in:
Chris Double 2009-06-19 15:11:41 +12:00
parent addeb69d4c
commit 809dee508d
4 changed files with 19 additions and 2 deletions

View File

@ -39,3 +39,4 @@ bug495129a.patch: Fix from liboggplay commit 6c8e11.
bug495129b.patch: Fix from liboggplay commit 3602bf.
bug487519.patch: Fix for bug 487519.
bug498815.patch: Fix for bug 498815.

View File

@ -0,0 +1,15 @@
diff --git a/media/liboggplay/src/liboggplay/oggplay_callback.c b/media/liboggplay/src/liboggplay/oggplay_callback.c
index 8706014..bd45123 100644
--- a/media/liboggplay/src/liboggplay/oggplay_callback.c
+++ b/media/liboggplay/src/liboggplay/oggplay_callback.c
@@ -701,8 +701,8 @@ oggplay_callback_predetected (OGGZ *oggz, ogg_packet *op, long serialno,
* call appropriate callback
*/
if (callbacks[content_type].callback != NULL) {
- callbacks[content_type].callback(oggz, op, serialno,
- me->decode_data[me->num_tracks - 1]);
+ return callbacks[content_type].callback(oggz, op, serialno,
+ me->decode_data[me->num_tracks - 1]);
}
return 0;

View File

@ -701,8 +701,8 @@ oggplay_callback_predetected (OGGZ *oggz, ogg_packet *op, long serialno,
* call appropriate callback
*/
if (callbacks[content_type].callback != NULL) {
callbacks[content_type].callback(oggz, op, serialno,
me->decode_data[me->num_tracks - 1]);
return callbacks[content_type].callback(oggz, op, serialno,
me->decode_data[me->num_tracks - 1]);
}
return 0;

View File

@ -59,4 +59,5 @@ patch -p3 < bug488951_yuv_fix_2.patch
patch -p3 < bug495129a.patch
patch -p3 < bug495129b.patch
patch -p3 < bug487519.patch
patch -p3 < bug498815.patch
patch -p3 < bug496529.patch