Author: leigh123linux Update of /cvs/free/rpms/acoustid-fingerprinter/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv16218 Modified Files: acoustid-fingerprinter.spec Added Files: acoustid-fingerprinter-0.6-ffmpeg.patch Log Message: * Wed Nov 27 2013 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 0.6-6 - Fix compile error acoustid-fingerprinter-0.6-ffmpeg.patch: decoder.h | 4 +++- ffmpeg/audioconvert.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) --- NEW FILE acoustid-fingerprinter-0.6-ffmpeg.patch --- --- a/ffmpeg/audioconvert.h +++ b/ffmpeg/audioconvert.h @@ -79,7 +79,7 @@ int avcodec_channel_layout_num_channels( * @param fmt_name Format name, or NULL if unknown * @return Channel layout mask */ -uint64_t avcodec_guess_channel_layout(int nb_channels, enum CodecID codec_id, const char *fmt_name); +uint64_t avcodec_guess_channel_layout(int nb_channels, enum AVCodecID codec_id, const char *fmt_name); struct AVAudioConvert; typedef struct AVAudioConvert AVAudioConvert; --- a/decoder.h +++ b/decoder.h @@ -39,6 +39,8 @@ extern "C" { #define AV_SAMPLE_FMT_S16 SAMPLE_FMT_S16 #endif +#define MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio + class Decoder { public: @@ -67,7 +69,7 @@ public: static void initialize(); private: - static const int BUFFER_SIZE = AVCODEC_MAX_AUDIO_FRAME_SIZE * 2; + static const int BUFFER_SIZE = MAX_AUDIO_FRAME_SIZE * 2; uint8_t *m_buffer1; uint8_t *m_buffer2; std::string m_file_name; Index: acoustid-fingerprinter.spec =================================================================== RCS file: /cvs/free/rpms/acoustid-fingerprinter/devel/acoustid-fingerprinter.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- acoustid-fingerprinter.spec 2 Oct 2013 08:13:21 -0000 1.12 +++ acoustid-fingerprinter.spec 27 Nov 2013 13:39:46 -0000 1.13 @@ -1,12 +1,13 @@ Name: acoustid-fingerprinter Version: 0.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Music AcoustID fingerprinting application Group: System Environment/Libraries License: GPLv2+ URL: http://acoustid.org/fingerprinter Source: https://github.com/downloads/lalinsky/%{name}/%{name}-%{version}.tar.gz +Patch0: acoustid-fingerprinter-0.6-ffmpeg.patch BuildRequires: cmake BuildRequires: qt4-devel @@ -28,6 +29,7 @@ %prep %setup -q +%patch0 -p1 -b .ffmpeg %build @@ -72,6 +74,9 @@ %changelog +* Wed Nov 27 2013 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 0.6-6 +- Fix compile error + * Wed Oct 02 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 0.6-5 - Rebuilt