blob: eadc4d98a91331543f6963893229203e62f33c9e (
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
41
42
43
44
45
46
47
|
Description: Fix FTBFS with FFmpeg 4.0
Author: James Cowgill <jcowgill@debian.org>
Bug-Debian: https://bugs.debian.org/888376
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/groove/encoder.c
+++ b/groove/encoder.c
@@ -616,7 +616,7 @@ int groove_encoder_attach(struct GrooveE
e->sink->audio_format = encoder->actual_audio_format;
e->sink->buffer_size = encoder->sink_buffer_size;
- e->sink->buffer_sample_count = (codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) ?
+ e->sink->buffer_sample_count = (codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE) ?
0 : e->stream->codec->frame_size;
e->sink->gain = encoder->gain;
--- a/groove/playlist.c
+++ b/groove/playlist.c
@@ -186,7 +186,7 @@ static int audio_decode_frame(struct Gro
if (!got_frame) {
// stop sending empty packets if the decoder is finished
- if (!pkt_temp->data && dec->codec->capabilities & CODEC_CAP_DELAY)
+ if (!pkt_temp->data && dec->codec->capabilities & AV_CODEC_CAP_DELAY)
return 0;
continue;
}
@@ -571,7 +571,7 @@ static int decode_one_frame(struct Groov
pthread_mutex_unlock(&f->seek_mutex);
if (f->eof) {
- if (f->audio_st->codec->codec->capabilities & CODEC_CAP_DELAY) {
+ if (f->audio_st->codec->codec->capabilities & AV_CODEC_CAP_DELAY) {
av_init_packet(pkt);
pkt->data = NULL;
pkt->size = 0;
--- a/groove/file.c
+++ b/groove/file.c
@@ -281,7 +281,7 @@ int groove_file_save(struct GrooveFile *
ocodec->rc_buffer_size = icodec->rc_buffer_size;
ocodec->field_order = icodec->field_order;
- uint64_t extra_size = (uint64_t)icodec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE;
+ uint64_t extra_size = (uint64_t)icodec->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE;
if (extra_size > INT_MAX) {
cleanup_save(file);
av_log(NULL, AV_LOG_ERROR, "codec extra size too big\n");
|
GitWeb
