[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36944] trunk/blender/source: == FFMPEG ==

[Peter Schlaile]

Revision: 36944
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36944
Author:   schlaile
Date:     2011-05-27 07:47:42 +0000 (Fri, 27 May 2011)
Log Message:
-----------
== FFMPEG ==

Fixed and added additional ffmpeg cruft checking. Oh dear.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
    trunk/blender/source/blender/imbuf/intern/anim_movie.c
    trunk/blender/source/blender/imbuf/intern/util.c
    trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.h

Modified: trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c	2011-05-27 07:24:38 UTC (rev 36943)
+++ trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c	2011-05-27 07:47:42 UTC (rev 36944)
@@ -61,14 +61,18 @@
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
 
-#if (LIBAVFORMAT_VERSION_MAJOR >= 52) && (LIBAVFORMAT_VERSION_MINOR >= 105)
+#if (LIBAVFORMAT_VERSION_MAJOR > 52) || ((LIBAVFORMAT_VERSION_MAJOR >= 52) && (LIBAVFORMAT_VERSION_MINOR >= 105))
 #define FFMPEG_HAVE_AVIO 1
 #endif
 
-#if (LIBAVFORMAT_VERSION_MAJOR >= 53) && (LIBAVFORMAT_VERSION_MINOR >= 3)
+#if (LIBAVFORMAT_VERSION_MAJOR > 53) || ((LIBAVFORMAT_VERSION_MAJOR >= 53) && (LIBAVFORMAT_VERSION_MINOR >= 1))
 #define FFMPEG_HAVE_DEFAULT_VAL_UNION 1
 #endif
 
+#if (LIBAVFORMAT_VERSION_MAJOR > 52) || ((LIBAVFORMAT_VERSION_MAJOR >= 52) && (LIBAVFORMAT_VERSION_MINOR >= 101))
+#define FFMPEG_HAVE_AV_DUMP_FORMAT 1
+#endif
+
 #ifndef FFMPEG_HAVE_AVIO
 #define AVIO_FLAG_WRITE URL_WRONLY
 #define avio_open url_fopen
@@ -82,6 +86,10 @@
 #define AVIO_FLAG_WRITE URL_WRONLY
 #endif
 
+#ifndef FFMPEG_HAVE_AV_DUMP_FORMAT
+#define av_dump_format dump_format
+#endif
+
 extern void do_init_ffmpeg(void);
 
 static int ffmpeg_type = 0;

Modified: trunk/blender/source/blender/imbuf/intern/anim_movie.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/anim_movie.c	2011-05-27 07:24:38 UTC (rev 36943)
+++ trunk/blender/source/blender/imbuf/intern/anim_movie.c	2011-05-27 07:47:42 UTC (rev 36944)
@@ -108,6 +108,14 @@
 #define FFMPEG_SWSCALE_COLOR_SPACE_SUPPORT
 #endif
 
+#if (LIBAVFORMAT_VERSION_MAJOR > 52) || ((LIBAVFORMAT_VERSION_MAJOR >= 52) && (LIBAVFORMAT_VERSION_MINOR >= 101))
+#define FFMPEG_HAVE_AV_DUMP_FORMAT 1
+#endif
+
+#ifndef FFMPEG_HAVE_AV_DUMP_FORMAT
+#define av_dump_format dump_format
+#endif
+
 #endif //WITH_FFMPEG
 
 #ifdef WITH_REDCODE

Modified: trunk/blender/source/blender/imbuf/intern/util.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/util.c	2011-05-27 07:24:38 UTC (rev 36943)
+++ trunk/blender/source/blender/imbuf/intern/util.c	2011-05-27 07:47:42 UTC (rev 36944)
@@ -62,8 +62,17 @@
 #include <libavformat/avformat.h>
 #include <libavdevice/avdevice.h>
 #include <libavutil/log.h>
+
+#if (LIBAVFORMAT_VERSION_MAJOR > 52) || ((LIBAVFORMAT_VERSION_MAJOR >= 52) && (LIBAVFORMAT_VERSION_MINOR >= 101))
+#define FFMPEG_HAVE_AV_DUMP_FORMAT 1
 #endif
 
+#ifndef FFMPEG_HAVE_AV_DUMP_FORMAT
+#define av_dump_format dump_format
+#endif
+
+#endif
+
 #define UTIL_DEBUG 0
 
 const char *imb_ext_image[] = {

Modified: trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.h
===================================================================
--- trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.h	2011-05-27 07:24:38 UTC (rev 36943)
+++ trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.h	2011-05-27 07:47:42 UTC (rev 36944)
@@ -34,7 +34,9 @@
 #include <libavformat/avformat.h>
 #include <libavcodec/avcodec.h>
 #include <libavutil/rational.h>
+#if (LIBAVFORMAT_VERSION_MAJOR > 52) || ((LIBAVFORMAT_VERSION_MAJOR >= 52) && (LIBAVFORMAT_VERSION_MINOR >= 101))
 #include <libavutil/parseutils.h>
+#endif
 #include <libswscale/swscale.h>
 #include "DNA_listBase.h"
 #include "BLI_threads.h"