[Gnash-commit] gnash ChangeLog server/asobj/NetStreamFfmpeg.cpp

[Tomas Groth]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Tomas Groth <tgc>       06/12/21 17:24:57

Modified files:
        .              : ChangeLog 
        server/asobj   : NetStreamFfmpeg.cpp 

Log message:
        * server/asobj/NetStreamFfmpeg.cpp: Removed the use of
          AVFormatParameters, since it doesn't seem to be needed, and might
          make older versions of ffmpeg useable.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1990&r2=1.1991
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1990
retrieving revision 1.1991
diff -u -b -r1.1990 -r1.1991
--- ChangeLog   21 Dec 2006 16:56:46 -0000      1.1990
+++ ChangeLog   21 Dec 2006 17:24:57 -0000      1.1991
@@ -2,6 +2,9 @@
 
        * backend/sound_handler_sdl.cpp: Fixed bug #18244: Forgot to
          write to the correct index, and to set a variabel to 0 in a loop.
+       * server/asobj/NetStreamFfmpeg.cpp: Removed the use of
+         AVFormatParameters, since it doesn't seem to be needed, and might
+         make older versions of ffmpeg useable.
 
 2006-12-21 Sandro Santilli <address@hidden>
 

Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/asobj/NetStreamFfmpeg.cpp    5 Dec 2006 14:26:10 -0000       1.1
+++ server/asobj/NetStreamFfmpeg.cpp    21 Dec 2006 17:24:57 -0000      1.2
@@ -244,10 +244,6 @@
 
        AVInputFormat* inputFmt = av_probe_input_format(pd, 1);
 
-       AVFormatParameters ap;
-       memset(&ap, 0, sizeof(AVFormatParameters));
-       ap.prealloced_context = 1;
-
        // Setup the filereader/seeker mechanism. 7th argument (NULL) is the 
writer function,
        // which isn't needed.
        init_put_byte(&ns->ByteIOCxt, new uint8_t[500000], 500000, 0, ns, 
NetStreamFfmpeg::readPacket, NULL, NetStreamFfmpeg::seekMedia);
@@ -256,7 +252,7 @@
        ns->m_FormatCtx = av_alloc_format_context();
 
        // Open the stream. the 4th argument is the filename, which we ignore.
-       if(av_open_input_stream(&ns->m_FormatCtx, &ns->ByteIOCxt, "", inputFmt, 
&ap) < 0){
+       if(av_open_input_stream(&ns->m_FormatCtx, &ns->ByteIOCxt, "", inputFmt, 
NULL) < 0){
                log_error("Couldn't open file '%s'", ns->url.c_str());
                ns->set_status("NetStream.Play.StreamNotFound");
                return 0;