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

[Tomas Groth]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Tomas Groth <tgc>       07/03/23 07:52:07

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

Log message:
                * server/asobj/NetStreamFfmpeg.cpp: Fixed getting time when
                  decoder isn't initialized.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2678&r2=1.2679
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.23&r2=1.24

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2678
retrieving revision 1.2679
diff -u -b -r1.2678 -r1.2679
--- ChangeLog   23 Mar 2007 00:30:10 -0000      1.2678
+++ ChangeLog   23 Mar 2007 07:52:07 -0000      1.2679
@@ -1,5 +1,10 @@
 2007-03-23 Tomas Groth Christensen <address@hidden>
 
+       * server/asobj/NetStreamFfmpeg.cpp: Fixed getting time when
+         decoder isn't initialized.
+
+2007-03-23 Tomas Groth Christensen <address@hidden>
+
        * backend/sound_handler_sdl.cpp: Count videos sounds.
        * libbase/FLVParser.{h,cpp}: Added. Our own homegrown FLV parser.
        * libbase/LoadThread.{h,cpp}: Use auto_ptr<tu_file> instead of tu_file,

Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- server/asobj/NetStreamFfmpeg.cpp    23 Mar 2007 00:30:10 -0000      1.23
+++ server/asobj/NetStreamFfmpeg.cpp    23 Mar 2007 07:52:07 -0000      1.24
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: NetStreamFfmpeg.cpp,v 1.23 2007/03/23 00:30:10 tgc Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.24 2007/03/23 07:52:07 tgc Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -820,13 +820,13 @@
 {
        boost::mutex::scoped_lock  lock(decoding_mutex);
 
-       long newpos;
+       long newpos = 0;
        double timebase;
 
        // Seek to new position
        if (m_isFLV) {
                newpos = m_parser->seek(static_cast<uint32_t>(pos*1000));
-       } else {
+       } else if (m_FormatCtx) {
 
                timebase = 
static_cast<double>(m_FormatCtx->streams[m_video_index]->time_base.num) / 
static_cast<double>(m_FormatCtx->streams[m_video_index]->time_base.den);
                newpos = static_cast<long>(pos / timebase);
@@ -835,6 +835,8 @@
                        log_warning("seeking failed");
                        return;
                }
+       } else {
+               return;
        }
 
        // This is kindof hackish and ugly :-(