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
32
33
34
|
From 2a91bff2810281e58948f478e9396c73e5c6154a Mon Sep 17 00:00:00 2001
From: Urs Fleisch <ufleisch@users.sourceforge.net>
Date: Mon, 4 Jun 2012 15:23:36 +0200
Subject: [PATCH 1/1] Support building with ffmpeg-0.11.
---
src/core/import/fingerprintcalculator.cpp | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/core/import/fingerprintcalculator.cpp b/src/core/import/fingerprintcalculator.cpp
index 05158ae..6ac632c 100644
--- a/src/core/import/fingerprintcalculator.cpp
+++ b/src/core/import/fingerprintcalculator.cpp
@@ -218,7 +218,7 @@ public:
}
bool createForCodec(const Codec& codecCtx) {
- m_ptr = ::av_audio_convert_alloc(SAMPLE_FMT_S16, codecCtx.channels(),
+ m_ptr = ::av_audio_convert_alloc(AV_SAMPLE_FMT_S16, codecCtx.channels(),
codecCtx.sampleFormat(), codecCtx.channels(), 0, 0);
return m_ptr != 0;
}
@@ -342,7 +342,7 @@ FingerprintCalculator::Result::Error FingerprintCalculator::decodeAudioFile(
return Result::NoCodecFound;
Converter converter;
- if (codec.sampleFormat() != SAMPLE_FMT_S16) {
+ if (codec.sampleFormat() != AV_SAMPLE_FMT_S16) {
if (!converter.createForCodec(codec))
return Result::NoConverterFound;
}
--
1.7.4.1
|
