From 2639ec2d4aaf2853006b950ce9a82b685d017afa Mon Sep 17 00:00:00 2001 From: Chris Double Date: Wed, 20 May 2009 15:54:14 +1200 Subject: [PATCH] Bug 493678. Set tracks to inactive initially so active track count doesn't get confused. r=wiking --HG-- extra : rebase_source : c3dbde1a035c3f7a550f46879fd620e2623939e4 --- media/liboggplay/README_MOZILLA | 2 ++ media/liboggplay/bug493678.patch | 13 +++++++++++++ media/liboggplay/src/liboggplay/oggplay_callback.c | 2 +- media/liboggplay/update.sh | 1 + 4 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 media/liboggplay/bug493678.patch diff --git a/media/liboggplay/README_MOZILLA b/media/liboggplay/README_MOZILLA index 5d4c04a79629..9ea34ecfccc6 100644 --- a/media/liboggplay/README_MOZILLA +++ b/media/liboggplay/README_MOZILLA @@ -20,6 +20,8 @@ bug493140: Fix for offsets not being used. aspect-ratio: Adds oggplay_get_video_aspect_ratio, used for bug 480058. +bug493678.patch: fix for infinite loop in oggplay_step_decode. See bug 493678. + bug493224.patch: Fix for bug 493224. seek_to_key_frame.patch: Adds oggplay_seek_to_keyframe(), as per bug 463358. diff --git a/media/liboggplay/bug493678.patch b/media/liboggplay/bug493678.patch new file mode 100644 index 000000000000..1721d2bdad69 --- /dev/null +++ b/media/liboggplay/bug493678.patch @@ -0,0 +1,13 @@ +diff --git a/media/liboggplay/src/liboggplay/oggplay_callback.c b/media/liboggplay/src/liboggplay/oggplay_callback.c +index 7683b80..ad127a0 100644 +--- a/media/liboggplay/src/liboggplay/oggplay_callback.c ++++ b/media/liboggplay/src/liboggplay/oggplay_callback.c +@@ -536,7 +536,7 @@ oggplay_initialise_decoder(OggPlay *me, int content_type, int serialno) { + decoder->content_type = content_type; + decoder->content_type_name = + oggz_stream_get_content_type (me->oggz, serialno); +- decoder->active = 1; ++ decoder->active = 0; + decoder->final_granulepos = -1; + decoder->player = me; + decoder->decoded_type = OGGPLAY_TYPE_UNKNOWN; diff --git a/media/liboggplay/src/liboggplay/oggplay_callback.c b/media/liboggplay/src/liboggplay/oggplay_callback.c index 43a7f3ff864a..428faee095d1 100644 --- a/media/liboggplay/src/liboggplay/oggplay_callback.c +++ b/media/liboggplay/src/liboggplay/oggplay_callback.c @@ -554,7 +554,7 @@ oggplay_initialise_decoder(OggPlay *me, int content_type, int serialno) { decoder->content_type = content_type; decoder->content_type_name = oggz_stream_get_content_type (me->oggz, serialno); - decoder->active = 1; + decoder->active = 0; decoder->final_granulepos = -1; decoder->player = me; decoder->decoded_type = OGGPLAY_TYPE_UNKNOWN; diff --git a/media/liboggplay/update.sh b/media/liboggplay/update.sh index 1d2086ae7b75..7e5da544258b 100644 --- a/media/liboggplay/update.sh +++ b/media/liboggplay/update.sh @@ -50,6 +50,7 @@ patch -p3 < bug492436.patch patch -p3 < bug493140.patch patch -p3 < bug481921.patch patch -p3 < aspect_ratio.patch +patch -p3 < bug493678.patch patch -p1 < bug493224.patch patch -p3 < seek_to_key_frame.patch