[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17269] trunk/blender: Video Texture: remove support for capture device, the linux ffmpeg repository is not ready yet.
Benoit Bolsee
benoit.bolsee at online.be
Sat Nov 1 16:42:03 CET 2008
Revision: 17269
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17269
Author: ben2610
Date: 2008-11-01 16:42:03 +0100 (Sat, 01 Nov 2008)
Log Message:
-----------
Video Texture: remove support for capture device, the linux ffmpeg repository is not ready yet.
Modified Paths:
--------------
trunk/blender/extern/ffmpeg/Makefile
trunk/blender/extern/ffmpeg/SConscript
trunk/blender/source/blender/imbuf/intern/util.c
Modified: trunk/blender/extern/ffmpeg/Makefile
===================================================================
--- trunk/blender/extern/ffmpeg/Makefile 2008-11-01 15:35:07 UTC (rev 17268)
+++ trunk/blender/extern/ffmpeg/Makefile 2008-11-01 15:42:03 UTC (rev 17269)
@@ -32,7 +32,7 @@
include nan_subdirs.mk
-ALLDIRS = libavcodec libavformat libavutil libswscale libavdevice
+ALLDIRS = libavcodec libavformat libavutil libswscale
config::
./configure --disable-shared --enable-liba52bin --enable-gpl --disable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscaler --enable-pthreads
Modified: trunk/blender/extern/ffmpeg/SConscript
===================================================================
--- trunk/blender/extern/ffmpeg/SConscript 2008-11-01 15:35:07 UTC (rev 17268)
+++ trunk/blender/extern/ffmpeg/SConscript 2008-11-01 15:42:03 UTC (rev 17269)
@@ -3,7 +3,7 @@
Import('env')
-all_libs = ['libavformat', 'libavcodec', 'libswscale', 'libavutil', 'libavdevice']
+all_libs = ['libavformat', 'libavcodec', 'libswscale', 'libavutil']
root = "extern/ffmpeg"
if env['OURPLATFORM'] == 'win32-mingw':
Modified: trunk/blender/source/blender/imbuf/intern/util.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/util.c 2008-11-01 15:35:07 UTC (rev 17268)
+++ trunk/blender/source/blender/imbuf/intern/util.c 2008-11-01 15:42:03 UTC (rev 17269)
@@ -64,7 +64,7 @@
#ifdef WITH_FFMPEG
#include <ffmpeg/avcodec.h>
#include <ffmpeg/avformat.h>
-#include <ffmpeg/avdevice.h>
+//#include <ffmpeg/avdevice.h>
#if LIBAVFORMAT_VERSION_INT < (49 << 16)
#define FFMPEG_OLD_FRAME_RATE 1
@@ -237,7 +237,7 @@
if (!ffmpeg_init) {
ffmpeg_init = 1;
av_register_all();
- avdevice_register_all();
+ //avdevice_register_all();
}
}
More information about the Bf-blender-cvs
mailing list