blob: a5721cb167d72b2207ad85adb10853457e4ab474 (
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
35
36
37
38
39
40
|
--- app/fingerprinter/LAV_Source.cpp
+++ app/fingerprinter/LAV_Source.cpp
@@ -23,6 +23,10 @@
#define __STDC_CONSTANT_MACROS 1
#endif
+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000
+#endif
+
extern "C" {
#include <libavformat/avformat.h>
#include <libavutil/mathematics.h>
@@ -113,7 +117,7 @@
{
char buf[256];
AVPacket packet;
- AVFrame *decodedFrame = avcodec_alloc_frame();
+ AVFrame *decodedFrame = av_frame_alloc();
av_init_packet(&packet);
int frameFinished = 0;
@@ -288,7 +292,7 @@
av_free_packet(&packet);
}
timestamp += (double)nSamples / decodedFrame->sample_rate;
- avcodec_free_frame(&decodedFrame);
+ av_frame_free(&decodedFrame);
return outBuffer;
}
@@ -405,7 +409,7 @@
void LAV_Source::release()
{
- if ( d->inCodecContext && d->inCodecContext->codec_id != CODEC_ID_NONE )
+ if ( d->inCodecContext && d->inCodecContext->codec_id != AV_CODEC_ID_NONE )
{
avcodec_close(d->inCodecContext);
}
|
