diff options
| author | hasso <hasso@pkgsrc.org> | 2009-06-14 12:46:44 +0000 |
|---|---|---|
| committer | hasso <hasso@pkgsrc.org> | 2009-06-14 12:46:44 +0000 |
| commit | afd28eb07bffb957ec295d54d3e8a05daf39fa83 (patch) | |
| tree | aec148f32016324de6f142f2b1ed17a12b9b4757 | |
| parent | 852a84df5497d766ed4c31887530c7ab1288e0b5 (diff) | |
| download | pkgsrc-afd28eb07bffb957ec295d54d3e8a05daf39fa83.tar.gz | |
Fix build of the ffmpeg plugin.
| -rw-r--r-- | audio/akode/distinfo | 4 | ||||
| -rw-r--r-- | audio/akode/patches/patch-ad | 22 |
2 files changed, 22 insertions, 4 deletions
diff --git a/audio/akode/distinfo b/audio/akode/distinfo index 680de5613e9..e003dd61e90 100644 --- a/audio/akode/distinfo +++ b/audio/akode/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/02/26 18:00:34 hasso Exp $ +$NetBSD: distinfo,v 1.2 2009/06/14 12:46:44 hasso Exp $ SHA1 (30375-akode-2.0.2.tar.bz2) = 10ad1e335bc53c2a90d133b493568324514c729c RMD160 (30375-akode-2.0.2.tar.bz2) = fa0322367d8e24e541007d3f9e508c3c31370d96 @@ -6,7 +6,7 @@ Size (30375-akode-2.0.2.tar.bz2) = 472605 bytes SHA1 (patch-aa) = e984dc5d4f1e62812d8c0c9db4bf0476c1edf3fa SHA1 (patch-ab) = 0366386429f06655aabd3dbfd393182856750cc6 SHA1 (patch-ac) = 16ecd5bddc4a8490703380f06cf25abf54a2f99e -SHA1 (patch-ad) = b1e110ed925fd35714e0baf89a7ce485496fd0a6 +SHA1 (patch-ad) = 9bd599a37dbbe7ed9ce9b1d3bc9520f5e53f7a87 SHA1 (patch-ae) = e1b8b9439907a92531c1e0a0c4b494bd7776f770 SHA1 (patch-af) = 99f17f5d3a58ad659a1a8c4dab5ddf6b5382dbff SHA1 (patch-ag) = 5c3cb7d81af525f1816cd4489ff5097a8457a91e diff --git a/audio/akode/patches/patch-ad b/audio/akode/patches/patch-ad index f593de2e402..0e80e513526 100644 --- a/audio/akode/patches/patch-ad +++ b/audio/akode/patches/patch-ad @@ -1,7 +1,7 @@ -$NetBSD: patch-ad,v 1.1.1.1 2009/02/26 18:00:34 hasso Exp $ +$NetBSD: patch-ad,v 1.2 2009/06/14 12:46:44 hasso Exp $ --- akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp.orig 2006-08-10 21:37:20 +0300 -+++ akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp 2009-02-20 13:57:54 +0200 ++++ akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp 2009-06-14 15:14:53 +0300 @@ -26,9 +26,11 @@ #include "decoder.h" @@ -17,6 +17,24 @@ $NetBSD: patch-ad,v 1.1.1.1 2009/02/26 18:00:34 hasso Exp $ #include "ffmpeg_decoder.h" #include <iostream> +@@ -45,7 +47,7 @@ extern "C" { + aKode::File *file = (aKode::File*)opaque; + return file->write((char*)buf, size); + } +- static offset_t akode_seek(void* opaque, offset_t pos, int whence) ++ static int64_t akode_seek(void* opaque, int64_t pos, int whence) + { + aKode::File *file = (aKode::File*)opaque; + return file->seek(pos, whence); +@@ -314,7 +316,7 @@ bool FFMPEGDecoder::readFrame(AudioFrame + assert(d->packet.stream_index == d->audioStream); + + retry: +- int len = avcodec_decode_audio( d->ic->streams[d->audioStream]->codec, ++ int len = avcodec_decode_audio2( d->ic->streams[d->audioStream]->codec, + (short*)d->buffer, &d->buffer_size, + d->packetData, d->packetSize ); + @@ -349,7 +351,7 @@ retry: assert(false); } |