| 1 |
lu_zero 08/03/26 08:56:09 |
| 2 |
|
| 3 |
Added: blender-2.45-ffmpeg.patch |
| 4 |
Log: |
| 5 |
Support ffmpeg new header layout |
| 6 |
(Portage version: 2.1.4.4) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 media-gfx/blender/files/blender-2.45-ffmpeg.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/blender/files/blender-2.45-ffmpeg.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/blender/files/blender-2.45-ffmpeg.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: blender-2.45-ffmpeg.patch |
| 15 |
=================================================================== |
| 16 |
--- ./source/blender/blenkernel/intern/writeffmpeg.c.old 2008-03-25 13:26:11.000000000 +0100 |
| 17 |
+++ ./source/blender/blenkernel/intern/writeffmpeg.c 2008-03-25 13:27:06.000000000 +0100 |
| 18 |
@@ -29,10 +29,10 @@ |
| 19 |
|
| 20 |
#include <stdlib.h> |
| 21 |
|
| 22 |
-#include <ffmpeg/avformat.h> |
| 23 |
-#include <ffmpeg/avcodec.h> |
| 24 |
-#include <ffmpeg/rational.h> |
| 25 |
-#include <ffmpeg/swscale.h> |
| 26 |
+#include <libavformat/avformat.h> |
| 27 |
+#include <libavcodec/avcodec.h> |
| 28 |
+#include <libavutil/rational.h> |
| 29 |
+#include <libswscale/swscale.h> |
| 30 |
|
| 31 |
#if LIBAVFORMAT_VERSION_INT < (49 << 16) |
| 32 |
#define FFMPEG_OLD_FRAME_RATE 1 |
| 33 |
--- source/blender/imbuf/intern/IMB_anim.h.old 2008-03-26 01:22:32.000000000 +0100 |
| 34 |
+++ source/blender/imbuf/intern/IMB_anim.h 2008-03-26 01:22:01.000000000 +0100 |
| 35 |
@@ -79,8 +79,8 @@ |
| 36 |
#endif /* WITH_QUICKTIME */ |
| 37 |
|
| 38 |
#ifdef WITH_FFMPEG |
| 39 |
-#include <ffmpeg/avformat.h> |
| 40 |
-#include <ffmpeg/avcodec.h> |
| 41 |
+#include <libavformat/avformat.h> |
| 42 |
+#include <libavcodec/avcodec.h> |
| 43 |
#endif |
| 44 |
|
| 45 |
#include "IMB_imbuf_types.h" |
| 46 |
--- source/blender/imbuf/intern/anim.c.old 2008-03-26 01:28:44.000000000 +0100 |
| 47 |
+++ source/blender/imbuf/intern/anim.c 2008-03-26 01:29:15.000000000 +0100 |
| 48 |
@@ -86,10 +86,10 @@ |
| 49 |
#include "IMB_anim5.h" |
| 50 |
|
| 51 |
#ifdef WITH_FFMPEG |
| 52 |
-#include <ffmpeg/avformat.h> |
| 53 |
-#include <ffmpeg/avcodec.h> |
| 54 |
-#include <ffmpeg/rational.h> |
| 55 |
-#include <ffmpeg/swscale.h> |
| 56 |
+#include <libavformat/avformat.h> |
| 57 |
+#include <libavcodec/avcodec.h> |
| 58 |
+#include <libavutil/rational.h> |
| 59 |
+#include <libswscale/swscale.h> |
| 60 |
|
| 61 |
#if LIBAVFORMAT_VERSION_INT < (49 << 16) |
| 62 |
#define FFMPEG_OLD_FRAME_RATE 1 |
| 63 |
--- source/blender/imbuf/intern/util.c.old 2008-03-26 01:52:13.000000000 +0100 |
| 64 |
+++ source/blender/imbuf/intern/util.c 2008-03-26 01:52:48.000000000 +0100 |
| 65 |
@@ -60,8 +60,8 @@ |
| 66 |
#endif |
| 67 |
|
| 68 |
#ifdef WITH_FFMPEG |
| 69 |
-#include <ffmpeg/avcodec.h> |
| 70 |
-#include <ffmpeg/avformat.h> |
| 71 |
+#include <libavcodec/avcodec.h> |
| 72 |
+#include <libavformat/avformat.h> |
| 73 |
|
| 74 |
#if LIBAVFORMAT_VERSION_INT < (49 << 16) |
| 75 |
#define FFMPEG_OLD_FRAME_RATE 1 |
| 76 |
--- source/blender/src/hddaudio.c.old 2008-03-26 02:04:26.000000000 +0100 |
| 77 |
+++ source/blender/src/hddaudio.c 2008-03-26 02:04:50.000000000 +0100 |
| 78 |
@@ -36,9 +36,9 @@ |
| 79 |
#endif |
| 80 |
|
| 81 |
#ifdef WITH_FFMPEG |
| 82 |
-#include <ffmpeg/avformat.h> |
| 83 |
-#include <ffmpeg/avcodec.h> |
| 84 |
-#include <ffmpeg/rational.h> |
| 85 |
+#include <libavformat/avformat.h> |
| 86 |
+#include <libavcodec/avcodec.h> |
| 87 |
+#include <libavutil/rational.h> |
| 88 |
#if LIBAVFORMAT_VERSION_INT < (49 << 16) |
| 89 |
#define FFMPEG_OLD_FRAME_RATE 1 |
| 90 |
#else |
| 91 |
--- source/blender/src/buttons_scene.c.old 2008-03-26 02:19:19.000000000 +0100 |
| 92 |
+++ source/blender/src/buttons_scene.c 2008-03-26 02:19:45.000000000 +0100 |
| 93 |
@@ -103,8 +103,8 @@ |
| 94 |
|
| 95 |
#ifdef WITH_FFMPEG |
| 96 |
|
| 97 |
-#include <ffmpeg/avcodec.h> /* for PIX_FMT_* and CODEC_ID_* */ |
| 98 |
-#include <ffmpeg/avformat.h> |
| 99 |
+#include <libavcodec/avcodec.h> /* for PIX_FMT_* and CODEC_ID_* */ |
| 100 |
+#include <libavformat/avformat.h> |
| 101 |
|
| 102 |
static int ffmpeg_preset_sel = 0; |
| 103 |
|
| 104 |
|
| 105 |
|
| 106 |
|
| 107 |
-- |
| 108 |
gentoo-commits@l.g.o mailing list |
Archives