diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-03-31 22:41:54 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-03-31 22:41:54 +0200 |
| commit | 023dd28a303961cbf2848f13d3156c162d5e76c0 (patch) | |
| tree | 2464aa01885d2a9f0c52fe893ce0afc8adff6ee7 /gnu/packages/patches/audacity-fix-ffmpeg-binding.patch | |
| parent | a06af9f5284f7b5b649f5dc32131de18115ec92e (diff) | |
| parent | 15aa2c38429a5785ed08519c88ff89a0b7027f0f (diff) | |
| download | guix-023dd28a303961cbf2848f13d3156c162d5e76c0.tar guix-023dd28a303961cbf2848f13d3156c162d5e76c0.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches/audacity-fix-ffmpeg-binding.patch')
| -rw-r--r-- | gnu/packages/patches/audacity-fix-ffmpeg-binding.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/gnu/packages/patches/audacity-fix-ffmpeg-binding.patch b/gnu/packages/patches/audacity-fix-ffmpeg-binding.patch new file mode 100644 index 0000000000..d6d65338d9 --- /dev/null +++ b/gnu/packages/patches/audacity-fix-ffmpeg-binding.patch @@ -0,0 +1,32 @@ +This resolves some "declaration of C function conflicts with previous +declaration" errors during compilation. + +--- a/src/FFmpeg.h 2015-02-21 00:33:33.853857529 +0100 ++++ b/src/FFmpeg.h 2015-02-21 00:35:09.626497205 +0100 +@@ -688,7 +688,7 @@ + FFMPEG_FUNCTION_WITH_RETURN( + AVOutputFormat*, + av_oformat_next, +- (AVOutputFormat *f), ++ (const AVOutputFormat *f), + (f) + ); + FFMPEG_FUNCTION_WITH_RETURN( +@@ -755,7 +755,7 @@ + FFMPEG_FUNCTION_WITH_RETURN( + int, + av_fifo_size, +- (AVFifoBuffer *f), ++ (const AVFifoBuffer *f), + (f) + ); + FFMPEG_FUNCTION_WITH_RETURN( +@@ -801,7 +801,7 @@ + FFMPEG_FUNCTION_WITH_RETURN( + AVDictionaryEntry *, + av_dict_get, +- (AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags), ++ (const AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags), + (m, key, prev, flags) + ); + FFMPEG_FUNCTION_WITH_RETURN( |