blob: adde2a541450eb351ee2faf3eccde384072012a3 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
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 );
}
}
|
GitWeb
