Bug 493678. Set tracks to inactive initially so active track count doesn't get confused. r=wiking

--HG--
extra : rebase_source : c3dbde1a035c3f7a550f46879fd620e2623939e4
This commit is contained in:
Chris Double 2009-05-20 15:54:14 +12:00
Родитель bcfea37cf7
Коммит 2639ec2d4a
4 изменённых файлов: 17 добавлений и 1 удалений

Просмотреть файл

@ -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.

Просмотреть файл

@ -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;

Просмотреть файл

@ -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;

Просмотреть файл

@ -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