| 1 |
ssuominen 09/06/20 22:57:57 |
| 2 |
|
| 3 |
Modified: 020_all_ffmpeg.patch |
| 4 |
Log: |
| 5 |
Update to patchset 4 |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.3 src/patchsets/stepmania/3.9/020_all_ffmpeg.patch |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/stepmania/3.9/020_all_ffmpeg.patch?rev=1.3&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/stepmania/3.9/020_all_ffmpeg.patch?rev=1.3&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/stepmania/3.9/020_all_ffmpeg.patch?r1=1.2&r2=1.3 |
| 13 |
|
| 14 |
Index: 020_all_ffmpeg.patch |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo/src/patchsets/stepmania/3.9/020_all_ffmpeg.patch,v |
| 17 |
retrieving revision 1.2 |
| 18 |
retrieving revision 1.3 |
| 19 |
diff -u -r1.2 -r1.3 |
| 20 |
--- 020_all_ffmpeg.patch 16 Mar 2008 12:12:24 -0000 1.2 |
| 21 |
+++ 020_all_ffmpeg.patch 20 Jun 2009 22:57:57 -0000 1.3 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
diff -ur StepMania-3.9-src.orig/configure.ac StepMania-3.9-src/configure.ac |
| 24 |
--- StepMania-3.9-src.orig/configure.ac 2005-11-03 17:27:02.000000000 +0200 |
| 25 |
-+++ StepMania-3.9-src/configure.ac 2007-08-07 16:57:06.000000000 +0300 |
| 26 |
++++ StepMania-3.9-src/configure.ac 2009-06-21 00:56:14.000000000 +0300 |
| 27 |
@@ -159,39 +159,13 @@ |
| 28 |
SM_AUDIO |
| 29 |
SM_TLS |
| 30 |
@@ -46,10 +46,9 @@ |
| 31 |
|
| 32 |
SM_CHECK_CRASH_HANDLER |
| 33 |
|
| 34 |
-Only in StepMania-3.9-src: configure.ac.orig |
| 35 |
diff -ur StepMania-3.9-src.orig/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp StepMania-3.9-src/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp |
| 36 |
--- StepMania-3.9-src.orig/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp 2005-10-17 05:25:55.000000000 +0300 |
| 37 |
-+++ StepMania-3.9-src/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp 2007-08-07 16:57:06.000000000 +0300 |
| 38 |
++++ StepMania-3.9-src/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp 2009-06-21 00:56:20.000000000 +0300 |
| 39 |
@@ -1,3 +1,6 @@ |
| 40 |
+#define __STDC_CONSTANT_MACROS |
| 41 |
+#include <stdint.h> |
| 42 |
@@ -61,9 +60,10 @@ |
| 43 |
#if defined(_WIN32) |
| 44 |
#include "ffmpeg/include/ffmpeg/avformat.h" |
| 45 |
#else |
| 46 |
+-#include <ffmpeg/avformat.h> |
| 47 |
+extern "C" |
| 48 |
+{ |
| 49 |
- #include <ffmpeg/avformat.h> |
| 50 |
++#include <libavformat/avformat.h> |
| 51 |
+} |
| 52 |
#endif |
| 53 |
-}; |
| 54 |
@@ -71,18 +71,18 @@ |
| 55 |
+#if !defined(HAVE_IMG_CONVERT) |
| 56 |
+extern "C" |
| 57 |
+{ |
| 58 |
-+#include <ffmpeg/swscale.h> |
| 59 |
++#include <libswscale/swscale.h> |
| 60 |
+} |
| 61 |
+#endif // HAVE_IMG_CONVERT |
| 62 |
-+ void img_convert__(AVPicture *dst, int dst_pix_fmt, |
| 63 |
-+ const AVPicture *src, int pix_fmt, |
| 64 |
++ void img_convert__(AVPicture *dst, enum PixelFormat dst_pix_fmt, |
| 65 |
++ const AVPicture *src, enum PixelFormat pix_fmt, |
| 66 |
+ int width, int height) |
| 67 |
+ { |
| 68 |
+#ifdef HAVE_IMG_CONVERT |
| 69 |
+ img_convert(dst, dst_pix_fmt, src, pix_fmt, width, height); |
| 70 |
+#else |
| 71 |
+ static SwsContext* context = 0; |
| 72 |
-+ context = sws_getCachedContext(context, width, height, pix_fmt, width, height, dst_pix_fmt, 0, NULL, NULL, NULL); |
| 73 |
++ context = sws_getCachedContext(context, width, height, pix_fmt, width, height, dst_pix_fmt, SWS_SPLINE, NULL, NULL, NULL); |
| 74 |
+ sws_scale(context, const_cast<uint8_t**>(src->data), const_cast<int*>(src->linesize), 0, height, dst->data, dst->linesize); |
| 75 |
+#endif // HAVE_IMG_CONVERT |
| 76 |
+ } |
| 77 |
@@ -179,6 +179,15 @@ |
| 78 |
default: Error = ssprintf( "unknown error %i", err ); break; |
| 79 |
} |
| 80 |
|
| 81 |
+@@ -522,7 +574,7 @@ |
| 82 |
+ return f->Read( buf, size ); |
| 83 |
+ } |
| 84 |
+ |
| 85 |
+-avcodec::offset_t URLRageFile_seek( avcodec::URLContext *h, avcodec::offset_t pos, int whence ) |
| 86 |
++int64_t URLRageFile_seek( avcodec::URLContext *h, int64_t pos, int whence ) |
| 87 |
+ { |
| 88 |
+ RageFile *f = (RageFile *) h->priv_data; |
| 89 |
+ return f->Seek( (int) pos, whence ); |
| 90 |
@@ -573,6 +625,17 @@ |
| 91 |
if ( stream == NULL ) |
| 92 |
RageException::Throw( "AVCodec (%s): Couldn't find any video streams", GetID().filename.c_str() ); |
| 93 |
@@ -245,7 +254,7 @@ |
| 94 |
return 0; |
| 95 |
diff -ur StepMania-3.9-src.orig/src/Makefile.am StepMania-3.9-src/src/Makefile.am |
| 96 |
--- StepMania-3.9-src.orig/src/Makefile.am 2004-09-08 09:48:45.000000000 +0300 |
| 97 |
-+++ StepMania-3.9-src/src/Makefile.am 2007-08-07 16:57:06.000000000 +0300 |
| 98 |
++++ StepMania-3.9-src/src/Makefile.am 2009-06-21 00:56:14.000000000 +0300 |
| 99 |
@@ -303,6 +303,10 @@ |
| 100 |
$(XLIBS) \ |
| 101 |
$(srcdir)/libresample/libresample.a |
| 102 |
@@ -257,4 +266,3 @@ |
| 103 |
stepmania_SOURCES = $(main_SOURCES) |
| 104 |
stepmania_LDADD = $(main_LDADD) |
| 105 |
|
| 106 |
-Only in StepMania-3.9-src/src: Makefile.am.orig |
Archives