gnash-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Gnash-commit] gnash ChangeLog server/asobj/NetStream.h


From: Markus Gothe
Subject: [Gnash-commit] gnash ChangeLog server/asobj/NetStream.h
Date: Fri, 03 Nov 2006 15:35:59 +0000

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/11/03 15:35:59

Modified files:
        .              : ChangeLog 
        server/asobj   : NetStream.h 

Log message:
        #ifdef USE_FFMPEG...

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1494&r2=1.1495
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStream.h?cvsroot=gnash&r1=1.10&r2=1.11

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1494
retrieving revision 1.1495
diff -u -b -r1.1494 -r1.1495
--- ChangeLog   3 Nov 2006 15:27:27 -0000       1.1494
+++ ChangeLog   3 Nov 2006 15:35:58 -0000       1.1495
@@ -8,6 +8,7 @@
 2006-11-03 Markus Gothe <address@hidden>
 
        * server/asobj/Math.cpp: Added #include <string>.
+       * server/asobj/NetStream.h: #ifdef USE_FFMPEG.
 
 2006-11-03 Vitaly Alexeev <address@hidden>
 

Index: server/asobj/NetStream.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStream.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/asobj/NetStream.h    3 Nov 2006 15:09:25 -0000       1.10
+++ server/asobj/NetStream.h    3 Nov 2006 15:35:58 -0000       1.11
@@ -18,7 +18,7 @@
 //
 //
 
-/*  $Id: NetStream.h,v 1.10 2006/11/03 15:09:25 alexeev Exp $ */
+/*  $Id: NetStream.h,v 1.11 2006/11/03 15:35:58 nihilus Exp $ */
 
 #ifndef __NETSTREAM_H__
 #define __NETSTREAM_H__
@@ -162,11 +162,12 @@
                 return m_go;
         }
 
+#ifdef USE_FFMPEG
        inline double as_double(AVRational time)
        {
     return time.num / (double) time.den;
        }
-
+#endif
         static void* av_streamer(void* arg);
         static void audio_streamer(void *udata, uint8 *stream, int len);
 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]