|
0 |
Description: Replace deprecated FFmpeg API
|
|
1 |
Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
|
|
2 |
Last-Update: <2015-11-02>
|
|
3 |
|
|
4 |
--- squeezelite-1.8.orig/ffmpeg.c
|
|
5 |
+++ squeezelite-1.8/ffmpeg.c
|
|
6 |
@@ -52,8 +52,8 @@ struct ff_s {
|
|
7 |
unsigned (* avcodec_version)(void);
|
|
8 |
AVCodec * (* avcodec_find_decoder)(int);
|
|
9 |
int attribute_align_arg (* avcodec_open2)(AVCodecContext *, const AVCodec *, AVDictionary **);
|
|
10 |
- AVFrame * (* avcodec_alloc_frame)(void);
|
|
11 |
- void (* avcodec_free_frame)(AVFrame **);
|
|
12 |
+ AVFrame * (* av_frame_alloc)(void);
|
|
13 |
+ void (* av_frame_free)(AVFrame **);
|
|
14 |
int attribute_align_arg (* avcodec_decode_audio4)(AVCodecContext *, AVFrame *, int *, const AVPacket *);
|
|
15 |
// ffmpeg symbols to be dynamically loaded from libavformat
|
|
16 |
unsigned (* avformat_version)(void);
|
|
17 |
@@ -324,7 +324,7 @@ static decode_state ff_decode(void) {
|
|
18 |
|
|
19 |
AVCODEC(ff, open2, ff->codecC, codec, NULL);
|
|
20 |
|
|
21 |
- ff->frame = AVCODEC(ff, alloc_frame);
|
|
22 |
+ ff->frame = AV(ff, frame_alloc);
|
|
23 |
|
|
24 |
ff->avpkt = AV(ff, malloc, sizeof(AVPacket));
|
|
25 |
if (ff->avpkt == NULL) {
|
|
26 |
@@ -520,9 +520,9 @@ static void _free_ff_data(void) {
|
|
27 |
if (ff->frame) {
|
|
28 |
// ffmpeg version dependant free function
|
|
29 |
#if !LINKALL
|
|
30 |
- ff->avcodec_free_frame ? AVCODEC(ff, free_frame, &ff->frame) : AV(ff, freep, &ff->frame);
|
|
31 |
+ ff->av_frame_free ? AV(ff, frame_free, &ff->frame) : AV(ff, freep, &ff->frame);
|
|
32 |
#elif LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54,28,0)
|
|
33 |
- AVCODEC(ff, free_frame, &ff->frame);
|
|
34 |
+ AV(ff, frame_free, &ff->frame);
|
|
35 |
#else
|
|
36 |
AV(ff, freep, &ff->frame);
|
|
37 |
#endif
|
|
38 |
@@ -607,8 +607,8 @@ static bool load_ff() {
|
|
39 |
ff->avcodec_version = dlsym(handle_codec, "avcodec_version");
|
|
40 |
ff->avcodec_find_decoder = dlsym(handle_codec, "avcodec_find_decoder");
|
|
41 |
ff->avcodec_open2 = dlsym(handle_codec, "avcodec_open2");
|
|
42 |
- ff->avcodec_alloc_frame = dlsym(handle_codec, "avcodec_alloc_frame");
|
|
43 |
- ff->avcodec_free_frame = dlsym(handle_codec, "avcodec_free_frame");
|
|
44 |
+ ff->av_frame_alloc = dlsym(handle_codec, "av_frame_alloc");
|
|
45 |
+ ff->av_frame_free = dlsym(handle_codec, "av_frame_free");
|
|
46 |
ff->avcodec_decode_audio4 = dlsym(handle_codec, "avcodec_decode_audio4");
|
|
47 |
ff->av_init_packet = dlsym(handle_codec, "av_init_packet");
|
|
48 |
ff->av_free_packet = dlsym(handle_codec, "av_free_packet");
|