[Bf-committers] Attn schlaile -- Re: [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19359] trunk/blender: == FFMPEG ==

[Chris Want]

Peter Schlaile wrote:
> Revision: 19359
>           http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19359
> Author:   schlaile
> Date:     2009-03-22 20:19:21 +0100 (Sun, 22 Mar 2009)
> 
> Log Message:
> -----------
> == FFMPEG ==
> 
> Updated ffmpeg to release version 0.5
> updated x264 to today's daily build
> thanks to ben2610 for first patches (but you got hddaudio.c wrong :)

This breaks things for me (CMake on Ubuntu), in particular:

--- source/gameengine/VideoTexture/VideoFFmpeg.h        (revision 19358)
+++ source/gameengine/VideoTexture/VideoFFmpeg.h        (working copy)
@@ -25,10 +25,10 @@
  #ifdef WITH_FFMPEG
  extern "C" {
  #include <pthread.h>
-#include <ffmpeg/avformat.h>
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/rational.h>
-#include <ffmpeg/swscale.h>
+#include <libavformat/avformat.h>
+#include <libavcodec/avcodec.h>
+#include <libavutil/rational.h>
+#include <libswscale/swscale.h>
  #include "DNA_listBase.h"
  #include "BLI_threads.h"
  #include "BLI_blenlib.h"

Why, can't these ffmpeg headers just use "#include <avformat.h>" and
let the system decided where to find the header?

Chris