[gentoo-commits] gentoo-x86 commit in media-libs/FusionSound/files: FusionSound-1.1.1-segfault.patch FusionSound-1.1.1-ffmpeg2.patch

[Alexis Ballier (aballier)]

aballier    15/02/08 10:37:53

  Added:                FusionSound-1.1.1-segfault.patch
                        FusionSound-1.1.1-ffmpeg2.patch
  Log:
  Fix build with ffmpeg2.
  
  (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 
160F534A)

Revision  Changes    Path
1.1                  
media-libs/FusionSound/files/FusionSound-1.1.1-segfault.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/FusionSound/files/FusionSound-1.1.1-segfault.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/FusionSound/files/FusionSound-1.1.1-segfault.patch?rev=1.1&content-type=text/plain

Index: FusionSound-1.1.1-segfault.patch
===================================================================
Fixes a segfault on probe.

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
@@ -1138,7 +1138,7 @@ IFusionSoundMusicProvider_FFmpeg_WaitSta
 static DFBResult
 Probe( IFusionSoundMusicProvider_ProbeContext *ctx )
 {
-     AVProbeData    pd;
+     AVProbeData    pd = { 0 };
      AVInputFormat *format;
           
      av_register_all();
@@ -1165,7 +1165,7 @@ Construct( IFusionSoundMusicProvider *th
            const char                *filename,
            DirectStream              *stream )
 {
-     AVProbeData    pd;
+     AVProbeData    pd = { 0 };
      AVInputFormat *fmt;
      AVCodec       *c;
      unsigned char  buf[64];



1.1                  
media-libs/FusionSound/files/FusionSound-1.1.1-ffmpeg2.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/FusionSound/files/FusionSound-1.1.1-ffmpeg2.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/FusionSound/files/FusionSound-1.1.1-ffmpeg2.patch?rev=1.1&content-type=text/plain

Index: FusionSound-1.1.1-ffmpeg2.patch
===================================================================
Minimal change fix to build with ffmpeg2.

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
@@ -46,6 +46,10 @@
 #include <libavformat/avformat.h>
 #include <libavutil/mathematics.h>
 
+#ifndef MAX_AUDIO_FRAME_SIZE
+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
+#endif
+
 static DFBResult
 Probe( IFusionSoundMusicProvider_ProbeContext *ctx );
 
@@ -416,11 +420,11 @@ IFusionSoundMusicProvider_FFmpeg_Destruc
           /* Ugly hack to fix a bug (segfault) in url_fclose() */
           if (!(iformat->flags & AVFMT_NOFILE)) {
                iformat->flags |= AVFMT_NOFILE;
-               av_close_input_file( data->ctx );
+               avformat_close_input( &data->ctx );
                iformat->flags ^= AVFMT_NOFILE;
           }
           else {
-               av_close_input_file( data->ctx );
+               avformat_close_input( &data->ctx );
           }
      }