summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2012-02-26 13:42:30 +0000
committerAlexis Ballier <aballier@gentoo.org>2012-02-26 13:42:30 +0000
commit4acd97eb055e5a40d9d14085a0ef688a53ab5843 (patch)
tree178e59fffea03d1e1c5873ffe777d350020fe4e6 /media-libs/FusionSound/files
parentNew addition needed for net-misc/clusterssh (diff)
downloadgentoo-2-4acd97eb055e5a40d9d14085a0ef688a53ab5843.tar.gz
gentoo-2-4acd97eb055e5a40d9d14085a0ef688a53ab5843.tar.bz2
gentoo-2-4acd97eb055e5a40d9d14085a0ef688a53ab5843.zip
Add another patch to fix build with libavformat 54, ie, ffmpeg git
(Portage version: 2.2.0_alpha89/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/FusionSound/files')
-rw-r--r--media-libs/FusionSound/files/FusionSound-1.1.1-libavformat54.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/media-libs/FusionSound/files/FusionSound-1.1.1-libavformat54.patch b/media-libs/FusionSound/files/FusionSound-1.1.1-libavformat54.patch
new file mode 100644
index 000000000000..41f513ae9eff
--- /dev/null
+++ b/media-libs/FusionSound/files/FusionSound-1.1.1-libavformat54.patch
@@ -0,0 +1,31 @@
+Index: FusionSound-1.1.1/interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_ffmpeg.c
+===================================================================
+--- FusionSound-1.1.1.orig/interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_ffmpeg.c
++++ FusionSound-1.1.1/interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_ffmpeg.c
+@@ -65,7 +65,6 @@ typedef struct {
+
+ DirectStream *stream;
+
+- AVIOContext pb;
+ AVFormatContext *ctx;
+ AVStream *st;
+ void *iobuf;
+@@ -1191,16 +1190,8 @@ Construct( IFusionSoundMusicProvider *th
+ return D_OOM();
+ }
+
+- if (init_put_byte( &data->pb, data->iobuf, 4096, 0,
+- (void*)data, av_read_callback, NULL,
+- direct_stream_seekable( stream ) ? av_seek_callback : NULL ) < 0) {
+- D_ERROR( "IFusionSoundMusicProvider_FFmpeg: init_put_byte() failed!\n" );
+- IFusionSoundMusicProvider_FFmpeg_Destruct( thiz );
+- return DFB_INIT;
+- }
+-
+- if (av_open_input_stream( &data->ctx, &data->pb, filename, fmt, NULL ) < 0) {
+- D_ERROR( "IFusionSoundMusicProvider_FFmpeg: av_open_input_stream() failed!\n" );
++ if (avformat_open_input( &data->ctx, filename, fmt, NULL ) < 0) {
++ D_ERROR( "IFusionSoundMusicProvider_FFmpeg: avformat_open_input() failed!\n" );
+ IFusionSoundMusicProvider_FFmpeg_Destruct( thiz );
+ return DFB_FAILURE;
+ }