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

[Tomas Groth]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Tomas Groth <tgc>       07/05/30 12:42:03

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

Log message:
                * server/asobj/NetStreamFfmpeg.cpp: Fixed seeking to work when 
not
                  seeking to 0.
                * server/asobj/SoundFfmpeg.cpp: Silence a compiler warning.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3408&r2=1.3409
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.72&r2=1.73
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SoundFfmpeg.cpp?cvsroot=gnash&r1=1.9&r2=1.10

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3408
retrieving revision 1.3409
diff -u -b -r1.3408 -r1.3409
--- ChangeLog   30 May 2007 12:18:48 -0000      1.3408
+++ ChangeLog   30 May 2007 12:42:03 -0000      1.3409
@@ -1,3 +1,9 @@
+2007-05-30 Tomas Groth Christensen <address@hidden>
+
+       * server/asobj/NetStreamFfmpeg.cpp: Fixed seeking to work when not
+         seeking to 0.
+       * server/asobj/SoundFfmpeg.cpp: Silence a compiler warning.
+
 2007-05-30 Sandro Santilli <address@hidden>
 
        * libbase/FLVParser.{cpp,h}: drop setLoadThread method, require

Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- server/asobj/NetStreamFfmpeg.cpp    30 May 2007 12:18:49 -0000      1.72
+++ server/asobj/NetStreamFfmpeg.cpp    30 May 2007 12:42:03 -0000      1.73
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: NetStreamFfmpeg.cpp,v 1.72 2007/05/30 12:18:49 strk Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.73 2007/05/30 12:42:03 tgc Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1081,10 +1081,11 @@
 
        } else if (m_isFLV) {
                double newtime = static_cast<double>(newpos) / 1000.0;
-               m_start_clock += (m_last_audio_timestamp - newtime) / 1000.0;
+               if (m_VCodecCtx) m_start_clock += (m_last_video_timestamp - 
newtime) / 1000.0;
+               else m_start_clock += (m_last_audio_timestamp - newtime) / 
1000.0;
 
-               m_last_audio_timestamp = newtime;
-               m_last_video_timestamp = newtime;
+               if (m_ACodecCtx) m_last_audio_timestamp = newtime;
+               if (m_VCodecCtx) m_last_video_timestamp = newtime;
                m_current_timestamp = newtime;
        } else {
                AVPacket Packet;

Index: server/asobj/SoundFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SoundFfmpeg.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- server/asobj/SoundFfmpeg.cpp        4 May 2007 21:40:50 -0000       1.9
+++ server/asobj/SoundFfmpeg.cpp        30 May 2007 12:42:03 -0000      1.10
@@ -151,7 +151,7 @@
        // Find the first audio stream
        so->audioIndex = -1;
 
-       for (int i = 0; i < so->formatCtx->nb_streams; i++)
+       for (unsigned int i = 0; i < so->formatCtx->nb_streams; i++)
        {
                AVCodecContext* enc = so->formatCtx->streams[i]->codec;