| 1 |
aballier 12/02/26 13:42:30 |
| 2 |
|
| 3 |
Added: FusionSound-1.1.1-libavformat54.patch |
| 4 |
Log: |
| 5 |
Add another patch to fix build with libavformat 54, ie, ffmpeg git |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha89/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-libs/FusionSound/files/FusionSound-1.1.1-libavformat54.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/FusionSound/files/FusionSound-1.1.1-libavformat54.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/FusionSound/files/FusionSound-1.1.1-libavformat54.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: FusionSound-1.1.1-libavformat54.patch |
| 16 |
=================================================================== |
| 17 |
Index: FusionSound-1.1.1/interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_ffmpeg.c |
| 18 |
=================================================================== |
| 19 |
--- FusionSound-1.1.1.orig/interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_ffmpeg.c |
| 20 |
+++ FusionSound-1.1.1/interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_ffmpeg.c |
| 21 |
@@ -65,7 +65,6 @@ typedef struct { |
| 22 |
|
| 23 |
DirectStream *stream; |
| 24 |
|
| 25 |
- AVIOContext pb; |
| 26 |
AVFormatContext *ctx; |
| 27 |
AVStream *st; |
| 28 |
void *iobuf; |
| 29 |
@@ -1191,16 +1190,8 @@ Construct( IFusionSoundMusicProvider *th |
| 30 |
return D_OOM(); |
| 31 |
} |
| 32 |
|
| 33 |
- if (init_put_byte( &data->pb, data->iobuf, 4096, 0, |
| 34 |
- (void*)data, av_read_callback, NULL, |
| 35 |
- direct_stream_seekable( stream ) ? av_seek_callback : NULL ) < 0) { |
| 36 |
- D_ERROR( "IFusionSoundMusicProvider_FFmpeg: init_put_byte() failed!\n" ); |
| 37 |
- IFusionSoundMusicProvider_FFmpeg_Destruct( thiz ); |
| 38 |
- return DFB_INIT; |
| 39 |
- } |
| 40 |
- |
| 41 |
- if (av_open_input_stream( &data->ctx, &data->pb, filename, fmt, NULL ) < 0) { |
| 42 |
- D_ERROR( "IFusionSoundMusicProvider_FFmpeg: av_open_input_stream() failed!\n" ); |
| 43 |
+ if (avformat_open_input( &data->ctx, filename, fmt, NULL ) < 0) { |
| 44 |
+ D_ERROR( "IFusionSoundMusicProvider_FFmpeg: avformat_open_input() failed!\n" ); |
| 45 |
IFusionSoundMusicProvider_FFmpeg_Destruct( thiz ); |
| 46 |
return DFB_FAILURE; |
| 47 |
} |
Archives