[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog server/parser/video_stream_def....
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ChangeLog server/parser/video_stream_def.... |
Date: |
Thu, 28 Feb 2008 17:13:49 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 08/02/28 17:13:49
Modified files:
. : ChangeLog
server/parser : video_stream_def.cpp video_stream_def.h
Log message:
fix build and runtime with --disable-media.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5759&r2=1.5760
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/video_stream_def.cpp?cvsroot=gnash&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/video_stream_def.h?cvsroot=gnash&r1=1.25&r2=1.26
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5759
retrieving revision 1.5760
diff -u -b -r1.5759 -r1.5760
--- ChangeLog 28 Feb 2008 16:28:16 -0000 1.5759
+++ ChangeLog 28 Feb 2008 17:13:48 -0000 1.5760
@@ -1,5 +1,10 @@
2008-02-28 Sandro Santilli <address@hidden>
+ * server/parser/video_stream_def.{cpp,h}: fix build and runtime
+ with --disable-media.
+
+2008-02-28 Sandro Santilli <address@hidden>
+
* configure.ac: pretend --enable-media=gst was given by default,
so we don't fallback on ffmpeg, being still unstable.
* server/sprite_instance.cpp (stagePlacementCallback): don't queue
Index: server/parser/video_stream_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/video_stream_def.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- server/parser/video_stream_def.cpp 24 Feb 2008 19:21:12 -0000 1.42
+++ server/parser/video_stream_def.cpp 28 Feb 2008 17:13:49 -0000 1.43
@@ -16,7 +16,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: video_stream_def.cpp,v 1.42 2008/02/24 19:21:12 bjacques Exp $
+// $Id: video_stream_def.cpp,v 1.43 2008/02/28 17:13:49 strk Exp $
#include "video_stream_def.h"
#include "video_stream_instance.h"
@@ -89,12 +89,10 @@
}
#ifdef SOUND_GST
-# define VIDEO_DECODER_NAME VideoDecoderGst
+ _decoder.reset( new media::VideoDecoderGst(m_codec_id, _width, _height)
);
#elif defined(USE_FFMPEG)
-# define VIDEO_DECODER_NAME VideoDecoderFfmpeg
+ _decoder.reset( new media::VideoDecoderFfmpeg(m_codec_id, _width,
_height) );
#endif
- _decoder.reset( new media::VIDEO_DECODER_NAME(m_codec_id, _width,
_height) );
-#undef VIDEO_DECODER_NAME
}
void
@@ -103,6 +101,7 @@
// Character ID has been read already, and was loaded in the constructor
assert(tag == SWF::VIDEOFRAME);
+ if ( ! _decoder.get() ) return; // --enable-media=none - TODO: create a
NullVideoDecoder ?
assert ( _decoder.get() ); // not allowed to be called for a
dynamically-created video_stream_def
in->ensureBytes(2);
Index: server/parser/video_stream_def.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/video_stream_def.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- server/parser/video_stream_def.h 24 Feb 2008 19:21:12 -0000 1.25
+++ server/parser/video_stream_def.h 28 Feb 2008 17:13:49 -0000 1.26
@@ -16,7 +16,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: video_stream_def.h,v 1.25 2008/02/24 19:21:12 bjacques Exp $
+// $Id: video_stream_def.h,v 1.26 2008/02/28 17:13:49 strk Exp $
#ifndef GNASH_VIDEO_STREAM_DEF_H
#define GNASH_VIDEO_STREAM_DEF_H
@@ -33,12 +33,6 @@
#include "ControlTag.h"
#include "VideoDecoder.h"
-#ifdef SOUND_GST
-# include "VideoDecoderGst.h"
-#elif defined(USE_FFMPEG)
-# include "VideoDecoderFfmpeg.h"
-#endif
-
#include "image.h"
#include <boost/shared_array.hpp>
@@ -182,11 +176,7 @@
boost::uint32_t _height;
/// The decoder used to decode the video frames
-#ifdef SOUND_GST
- boost::scoped_ptr<media::VideoDecoderGst> _decoder;
-#elif defined(USE_FFMPEG)
- boost::scoped_ptr<media::VideoDecoderFfmpeg> _decoder;
-#endif
+ boost::scoped_ptr<media::VideoDecoder> _decoder;
};
} // end namespace gnash
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog server/parser/video_stream_def....,
Sandro Santilli <=