[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40529] trunk/blender/intern/ffmpeg/ ffmpeg_compat.h: give a more useful error when building with an old ffmpeg.
Campbell Barton
ideasman42 at gmail.com
Sun Sep 25 06:17:01 CEST 2011
Revision: 40529
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40529
Author: campbellbarton
Date: 2011-09-25 04:17:00 +0000 (Sun, 25 Sep 2011)
Log Message:
-----------
give a more useful error when building with an old ffmpeg.
Modified Paths:
--------------
trunk/blender/intern/ffmpeg/ffmpeg_compat.h
Modified: trunk/blender/intern/ffmpeg/ffmpeg_compat.h
===================================================================
--- trunk/blender/intern/ffmpeg/ffmpeg_compat.h 2011-09-25 02:49:46 UTC (rev 40528)
+++ trunk/blender/intern/ffmpeg/ffmpeg_compat.h 2011-09-25 04:17:00 UTC (rev 40529)
@@ -25,6 +25,15 @@
#include <libavformat/avformat.h>
+
+
+/* check our ffmpeg is new enough, avoids user complaints */
+#if (LIBAVFORMAT_VERSION_MAJOR < 52) || ((LIBAVFORMAT_VERSION_MAJOR == 52) && (LIBAVFORMAT_VERSION_MINOR <= 64))
+# error "FFmpeg 0.7 or newer is needed, Upgrade you're FFmpeg or disable it"
+#endif
+/* end sanity check */
+
+
#include <libavcodec/avcodec.h>
#include <libavutil/rational.h>
More information about the Bf-blender-cvs
mailing list