Commit 7e6cac3c authored by Chris Double's avatar Chris Double
Browse files

Backout due to windows reftest failure

parents 2e0cc3bf b5af8719

media/liboggplay/README_MOZILLA

+2 −5
Original line number Diff line number Diff line
@@ -13,8 +13,5 @@ to disable optimized yuv to rgb routines. 
The patch from Bug 452698 (yuv2argb.patch) is applied to fix

yuv to rgb conversion on PPC Mac OS X.



Apply patch from bug 468281 to get liboggplay svn r3863 changeset.

The patch for this is in bug468281_r3863.patch.



Apply patch from bug 468281 to get liboggplay svn r3864 changeset.

The patch for this is in bug468281_r3864.patch.
 
The patch from Bug 464007 (bug464007.patch) is applied

to fix oggplay issues.

media/liboggplay/bug464007.patch

0 → 100644
+18 −0
Original line number Diff line number Diff line 
diff --git a/media/liboggplay/src/liboggplay/oggplay.c b/media/liboggplay/src/liboggplay/oggplay.c

index 9a1c8b8..250064d 100644

--- a/media/liboggplay/src/liboggplay/oggplay.c

+++ b/media/liboggplay/src/liboggplay/oggplay.c

@@ -522,9 +522,11 @@ read_more_data:

       }

 

       /*

-       * ensure all tracks have their final data packet set to end_of_stream

+       * ensure all tracks have their final data packet set to end_of_stream.

+       * But skip doing this if we're shutting down --- me->buffer may not

+       * be in a safe state.

        */

-      if (me->buffer != NULL) {

+      if (me->buffer != NULL && !me->shutdown) {

         oggplay_buffer_set_last_data(me, me->buffer);

       }

media/liboggplay/bug468281_r3863.patch

deleted100644 → 0
+0 −975

File deleted.

Preview size limit exceeded, changes collapsed.

media/liboggplay/bug468281_r3864.patch

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
commit b16896c4b4c77dcff5d77851e17ab2846372e935

Author: oggk <oggk@8158c8cd-e7e1-0310-9fa4-c5954c97daef>

Date:   Tue Feb 24 23:19:59 2009 +0000



    fix crucially misplaced parenthesis

    

    

    

    git-svn-id: http://svn.annodex.net/liboggplay/trunk@3864 8158c8cd-e7e1-0310-9fa4-c5954c97daef



diff --git a/src/liboggplay/oggplay_tcp_reader.c b/src/liboggplay/oggplay_tcp_reader.c

index e40d2da..3becb6d 100644

--- a/src/liboggplay/oggplay_tcp_reader.c

+++ b/src/liboggplay/oggplay_tcp_reader.c

@@ -199,7 +199,7 @@ oggplay_hostname_and_path(char *location, char *proxy, int proxy_port,

 

     *port = 80;

 

-    if ((*path = strdup("/") == NULL))

+    if ((*path = strdup("/")) == NULL)

       goto error;

 

     return 0;

media/liboggplay/include/oggplay/oggplay.h

+10 −24
Original line number Diff line number Diff line
@@ -56,27 +56,20 @@ typedef int (OggPlayDataCallback)(OggPlay *player, int num_records, 
#include <oggplay/oggplay_callback_info.h>

#include <oggplay/oggplay_tools.h>

#include <oggplay/oggplay_seek.h>



/**

 * Create an OggPlay handle associated with the given reader.

 * The functions creates a new OggPlay handle and associates with

 * the given OggPlayReader and initialises the buffer.

 * 

 *

 * @param reader an OggPlayReader handle associated with the Ogg content

 * @return A new OggPlay handle

 * @retval NULL in case of error.

/*

#include <oggplay/oggplay_retrieve.h>

#include <oggplay/oggplay_cmml.h>

*/



OggPlay *

oggplay_init(void);



OggPlayErrorCode

oggplay_set_reader(OggPlay *OS, OggPlayReader *OSR);



OggPlay *

oggplay_open_with_reader(OggPlayReader *reader);



/**

 * Create a new OggPlay handle associated with the given reader.

 *

 * \param reader OggPlayReader handle associated with the Ogg content

 * \return A new OggPlay handle

 * \retval NULL in case of error.

 */

OggPlay *

oggplay_new_with_reader(OggPlayReader *reader);
@@ -135,13 +128,6 @@ oggplay_buffer_release(OggPlay *player, OggPlayCallbackInfo **track_info); 
void

oggplay_prepare_for_close(OggPlay *me);



/**

 * @brief Destroys the OggPlay handle along with the associated OggPlayReader

 * and clears out the buffer and shuts down the callback function. 

 *

 * @param player an OggPlay handle

 * @retval E_OGGPLAY_OK on success 

 */

OggPlayErrorCode

oggplay_close(OggPlay *player);