diff options
Diffstat (limited to 'media-gfx/blender/files/blender-2.46-ffmpeg.patch')
| -rw-r--r-- | media-gfx/blender/files/blender-2.46-ffmpeg.patch | 100 |
1 files changed, 100 insertions, 0 deletions
diff --git a/media-gfx/blender/files/blender-2.46-ffmpeg.patch b/media-gfx/blender/files/blender-2.46-ffmpeg.patch new file mode 100644 index 0000000..b06854c --- /dev/null +++ b/media-gfx/blender/files/blender-2.46-ffmpeg.patch @@ -0,0 +1,100 @@ +diff -urN blender-2.46/source/blender/blenkernel/intern/writeffmpeg.c blender-2.46.orig/source/blender/blenkernel/intern/writeffmpeg.c +--- blender-2.46/source/blender/blenkernel/intern/writeffmpeg.c 2008-05-20 12:02:12.000000000 +0200 ++++ blender-2.46.orig/source/blender/blenkernel/intern/writeffmpeg.c 2008-05-19 16:38:16.000000000 +0200 +@@ -29,11 +29,11 @@ + + #include <stdlib.h> + ++#include <libavformat/avformat.h> ++#include <libavcodec/avcodec.h> ++#include <libavutil/rational.h> ++#include <libswscale/swscale.h> ++#include <libavcodec/opt.h> +-#include <ffmpeg/avformat.h> +-#include <ffmpeg/avcodec.h> +-#include <ffmpeg/rational.h> +-#include <ffmpeg/swscale.h> +-#include <ffmpeg/opt.h> + + #if LIBAVFORMAT_VERSION_INT < (49 << 16) + #define FFMPEG_OLD_FRAME_RATE 1 +diff -urN blender-2.46/source/blender/imbuf/intern/anim.c blender-2.46.orig/source/blender/imbuf/intern/anim.c +--- blender-2.46/source/blender/imbuf/intern/anim.c 2008-05-20 12:05:41.000000000 +0200 ++++ blender-2.46.orig/source/blender/imbuf/intern/anim.c 2008-05-19 16:38:41.000000000 +0200 +@@ -83,10 +83,10 @@ + #include "IMB_anim5.h" + + #ifdef WITH_FFMPEG ++#include <libavformat/avformat.h> ++#include <libavcodec/avcodec.h> ++#include <libavutil/rational.h> ++#include <libswscale/swscale.h> +-#include <ffmpeg/avformat.h> +-#include <ffmpeg/avcodec.h> +-#include <ffmpeg/rational.h> +-#include <ffmpeg/swscale.h> + + #if LIBAVFORMAT_VERSION_INT < (49 << 16) + #define FFMPEG_OLD_FRAME_RATE 1 +diff -urN blender-2.46/source/blender/imbuf/intern/IMB_anim.h blender-2.46.orig/source/blender/imbuf/intern/IMB_anim.h +--- blender-2.46/source/blender/imbuf/intern/IMB_anim.h 2008-05-20 12:04:33.000000000 +0200 ++++ blender-2.46.orig/source/blender/imbuf/intern/IMB_anim.h 2008-05-19 16:38:41.000000000 +0200 +@@ -76,9 +76,9 @@ + #endif /* WITH_QUICKTIME */ + + #ifdef WITH_FFMPEG ++#include <libavformat/avformat.h> ++#include <libavcodec/avcodec.h> ++#include <libswscale/swscale.h> +-#include <ffmpeg/avformat.h> +-#include <ffmpeg/avcodec.h> +-#include <ffmpeg/swscale.h> + #endif + + #include "IMB_imbuf_types.h" +diff -urN blender-2.46/source/blender/imbuf/intern/util.c blender-2.46.orig/source/blender/imbuf/intern/util.c +--- blender-2.46/source/blender/imbuf/intern/util.c 2008-05-20 12:05:04.000000000 +0200 ++++ blender-2.46.orig/source/blender/imbuf/intern/util.c 2008-05-19 16:38:41.000000000 +0200 +@@ -62,8 +62,8 @@ + #endif + + #ifdef WITH_FFMPEG ++#include <libavcodec/avcodec.h> ++#include <libavformat/avformat.h> +-#include <ffmpeg/avcodec.h> +-#include <ffmpeg/avformat.h> + + #if LIBAVFORMAT_VERSION_INT < (49 << 16) + #define FFMPEG_OLD_FRAME_RATE 1 +diff -urN blender-2.46/source/blender/src/buttons_scene.c blender-2.46.orig/source/blender/src/buttons_scene.c +--- blender-2.46/source/blender/src/buttons_scene.c 2008-05-20 12:03:50.000000000 +0200 ++++ blender-2.46.orig/source/blender/src/buttons_scene.c 2008-05-19 16:38:39.000000000 +0200 +@@ -108,9 +108,9 @@ + + #ifdef WITH_FFMPEG + ++#include <libavcodec/avcodec.h> /* for PIX_FMT_* and CODEC_ID_* */ ++#include <libavformat/avformat.h> ++#include <libavcodec/opt.h> +-#include <ffmpeg/avcodec.h> /* for PIX_FMT_* and CODEC_ID_* */ +-#include <ffmpeg/avformat.h> +-#include <ffmpeg/opt.h> + + static int ffmpeg_preset_sel = 0; + +diff -urN blender-2.46/source/blender/src/hddaudio.c blender-2.46.orig/source/blender/src/hddaudio.c +--- blender-2.46/source/blender/src/hddaudio.c 2008-05-20 12:02:42.000000000 +0200 ++++ blender-2.46.orig/source/blender/src/hddaudio.c 2008-05-19 16:38:39.000000000 +0200 +@@ -33,9 +33,9 @@ + #endif + + #ifdef WITH_FFMPEG ++#include <libavformat/avformat.h> ++#include <libavcodec/avcodec.h> ++#include <libavutil/rational.h> +-#include <ffmpeg/avformat.h> +-#include <ffmpeg/avcodec.h> +-#include <ffmpeg/rational.h> + #if LIBAVFORMAT_VERSION_INT < (49 << 16) + #define FFMPEG_OLD_FRAME_RATE 1 + #else |