[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17274] trunk/blender/source/gameengine/ VideoTexture: VideoTexture: AVFormatContext:: pb is not a pointer for avformat library older than 52 (linux uses 51)

[Benoit Bolsee]

Revision: 17274
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17274
Author:   ben2610
Date:     2008-11-01 18:15:17 +0100 (Sat, 01 Nov 2008)

Log Message:
-----------
VideoTexture: AVFormatContext::pb is not a pointer for avformat library older than 52 (linux uses 51)

Modified Paths:
--------------
    trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.cpp
    trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.h

Modified: trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.cpp
===================================================================
--- trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.cpp	2008-11-01 17:07:24 UTC (rev 17273)
+++ trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.cpp	2008-11-01 17:15:17 UTC (rev 17274)
@@ -248,7 +248,13 @@
 	// open base class
 	VideoBase::openFile(filename);
 
-	if (m_formatCtx->pb->is_streamed)
+	if (
+#ifdef FFMPEG_PB_IS_POINTER
+        m_formatCtx->pb->is_streamed
+#else
+        m_formatCtx->pb.is_streamed
+#endif
+        )
 	{
 		// the file is in fact a streaming source, prevent seeking
 		m_isFile = false;
@@ -265,7 +271,7 @@
 	AVInputFormat		*inputFormat;
 	AVFormatParameters	formatParams;
 	AVRational			frameRate;
-	char				filename[28], rateStr[20];
+	char				*p, filename[28], rateStr[20];
 
 	do_init_ffmpeg();
 

Modified: trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.h
===================================================================
--- trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.h	2008-11-01 17:07:24 UTC (rev 17273)
+++ trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.h	2008-11-01 17:15:17 UTC (rev 17274)
@@ -36,6 +36,10 @@
 #define FFMPEG_CODEC_IS_POINTER 1
 #endif
 
+#if LIBAVFORMAT_VERSION_INT >= (52 << 16)
+#define FFMPEG_PB_IS_POINTER 1
+#endif
+
 #ifdef FFMPEG_CODEC_IS_POINTER
 static inline AVCodecContext* get_codec_from_stream(AVStream* stream)
 {