blob: 995766d842fcc8b3ebd1487355b7689aa5473198 (
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
32
33
34
|
Description: Replace removed macros
Rename CodecID to AVCodecID and replace AVCODEC_MAX_AUDIO_FRAME_SIZE
with its last value 192000.
Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Last-Update: <2014-05-13>
--- acoustid-fingerprinter-0.6.orig/decoder.h
+++ acoustid-fingerprinter-0.6/decoder.h
@@ -116,7 +116,7 @@ inline Decoder::Decoder(const std::strin
#endif
{
#ifdef HAVE_AV_AUDIO_CONVERT
- m_buffer2 = (uint8_t *)av_malloc(AVCODEC_MAX_AUDIO_FRAME_SIZE * 2 + 16);
+ m_buffer2 = (uint8_t *)av_malloc(192000 * 2 + 16);
#endif
#if NEW_AVFRAME_API
--- acoustid-fingerprinter-0.6.orig/ffmpeg/audioconvert.h
+++ acoustid-fingerprinter-0.6/ffmpeg/audioconvert.h
@@ -75,11 +75,11 @@ int avcodec_channel_layout_num_channels(
/**
* Guess the channel layout
* @param nb_channels
- * @param codec_id Codec identifier, or CODEC_ID_NONE if unknown
+ * @param codec_id Codec identifier, or AV_CODEC_ID_NONE if unknown
* @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;
|