Skip to content

Commit 0b85c60

Browse files
committed
Build with ffmpeg 8
1 parent 22d6a7a commit 0b85c60

File tree

12 files changed

+15
-33
lines changed

12 files changed

+15
-33
lines changed

.github/workflows/smoke.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ jobs:
3434
fail-fast: false
3535
matrix:
3636
config:
37-
- {os: ubuntu-24.04, python: "3.12", ffmpeg: "7.1.1", extras: true}
38-
- {os: ubuntu-24.04, python: "pypy3.10", ffmpeg: "7.1.1"}
39-
- {os: macos-14, python: "3.9", ffmpeg: "7.1.1"}
37+
- {os: ubuntu-24.04, python: "3.12", ffmpeg: "8.0", extras: true}
38+
- {os: ubuntu-24.04, python: "pypy3.10", ffmpeg: "8.0"}
39+
- {os: macos-14, python: "3.9", ffmpeg: "8.0"}
4040

4141
env:
4242
PYAV_PYTHON: python${{ matrix.config.python }}
@@ -109,7 +109,7 @@ jobs:
109109
fail-fast: false
110110
matrix:
111111
config:
112-
- {os: windows-latest, python: "3.9", ffmpeg: "7.1"}
112+
- {os: windows-latest, python: "3.9", ffmpeg: "8.0"}
113113

114114
steps:
115115
- name: Checkout

av/codec/codec.pyx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ class Capabilities(IntEnum):
3636
delay = lib.AV_CODEC_CAP_DELAY
3737
small_last_frame = lib.AV_CODEC_CAP_SMALL_LAST_FRAME
3838
hwaccel_vdpau = 1 << 7
39-
subframes = lib.AV_CODEC_CAP_SUBFRAMES
4039
experimental = lib.AV_CODEC_CAP_EXPERIMENTAL
4140
channel_conf = lib.AV_CODEC_CAP_CHANNEL_CONF
4241
neg_linesizes = 1 << 11

av/codec/context.pyx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ cdef class CodecContext:
494494
# the codec itself. So use the descriptor here.
495495
desc = self.codec.desc
496496
cdef int i = 0
497-
while desc.profiles[i].profile != lib.FF_PROFILE_UNKNOWN:
497+
while desc.profiles[i].profile != lib.AV_PROFILE_UNKNOWN:
498498
ret.append(desc.profiles[i].name)
499499
i += 1
500500

@@ -509,7 +509,7 @@ cdef class CodecContext:
509509
# the codec itself. So use the descriptor here.
510510
desc = self.codec.desc
511511
cdef int i = 0
512-
while desc.profiles[i].profile != lib.FF_PROFILE_UNKNOWN:
512+
while desc.profiles[i].profile != lib.AV_PROFILE_UNKNOWN:
513513
if desc.profiles[i].profile == self.ptr.profile:
514514
return desc.profiles[i].name
515515
i += 1
@@ -523,7 +523,7 @@ cdef class CodecContext:
523523
# the codec itself. So use the descriptor here.
524524
desc = self.codec.desc
525525
cdef int i = 0
526-
while desc.profiles[i].profile != lib.FF_PROFILE_UNKNOWN:
526+
while desc.profiles[i].profile != lib.AV_PROFILE_UNKNOWN:
527527
if desc.profiles[i].name == value:
528528
self.ptr.profile = desc.profiles[i].profile
529529
return

av/container/core.pyx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@ class Flags(Flag):
138138
bitexact: "When muxing, try to avoid writing any random/volatile data to the output. This includes any random IDs, real-time timestamps/dates, muxer version, etc. This flag is mainly intended for testing." = lib.AVFMT_FLAG_BITEXACT
139139
sort_dts: "Try to interleave outputted packets by dts (using this flag can slow demuxing down)." = lib.AVFMT_FLAG_SORT_DTS
140140
fast_seek: "Enable fast, but inaccurate seeks for some formats." = lib.AVFMT_FLAG_FAST_SEEK
141-
shortest: "Stop muxing when the shortest stream stops." = lib.AVFMT_FLAG_SHORTEST
142141
auto_bsf: "Add bitstream filters as requested by the muxer." = lib.AVFMT_FLAG_AUTO_BSF
143142

144143
class AudioCodec(IntEnum):

av/filter/filter.pyi

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ class Filter:
77
descriptor: Descriptor
88
options: tuple[Option, ...] | None
99
flags: int
10-
command_support: bool
1110

1211
def __init__(self, name: str) -> None: ...
1312

av/filter/filter.pyx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,6 @@ cdef class Filter:
4747
def flags(self):
4848
return self.ptr.flags
4949

50-
@property
51-
def command_support(self):
52-
return self.ptr.process_command != NULL
53-
5450
@property
5551
def inputs(self):
5652
if self._inputs is None:

av/format.pyx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ class Flags(Flag):
3131
no_bin_search: "Format does not allow to fall back on binary search via read_timestamp" = lib.AVFMT_NOBINSEARCH
3232
no_gen_search: "Format does not allow to fall back on generic search" = lib.AVFMT_NOGENSEARCH
3333
no_byte_seek: "Format does not allow seeking by bytes" = lib.AVFMT_NO_BYTE_SEEK
34-
allow_flush: "Format allows flushing. If not set, the muxer will not receive a NULL packet in the write_packet function." = lib.AVFMT_ALLOW_FLUSH
3534
ts_nonstrict: "Format does not require strictly increasing timestamps, but they must still be monotonic." = lib.AVFMT_TS_NONSTRICT
3635
ts_negative: "Format allows muxing negative timestamps." = lib.AVFMT_TS_NEGATIVE
3736
# If not set the timestamp will be shifted in `av_write_frame()` and `av_interleaved_write_frame()`

include/libavcodec/avcodec.pxd

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,10 @@ cdef extern from "libavcodec/avcodec.h" nogil:
8080
cdef enum:
8181
AV_CODEC_CAP_DRAW_HORIZ_BAND
8282
AV_CODEC_CAP_DR1
83-
# AV_CODEC_CAP_HWACCEL
8483
AV_CODEC_CAP_DELAY
8584
AV_CODEC_CAP_SMALL_LAST_FRAME
86-
# AV_CODEC_CAP_HWACCEL_VDPAU
87-
AV_CODEC_CAP_SUBFRAMES
8885
AV_CODEC_CAP_EXPERIMENTAL
8986
AV_CODEC_CAP_CHANNEL_CONF
90-
# AV_CODEC_CAP_NEG_LINESIZES
9187
AV_CODEC_CAP_FRAME_THREADS
9288
AV_CODEC_CAP_SLICE_THREADS
9389
AV_CODEC_CAP_PARAM_CHANGE
@@ -98,6 +94,9 @@ cdef extern from "libavcodec/avcodec.h" nogil:
9894
AV_CODEC_CAP_HYBRID
9995
AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE
10096

97+
cdef enum:
98+
AV_PROFILE_UNKNOWN = -99
99+
101100
cdef enum:
102101
FF_THREAD_FRAME
103102
FF_THREAD_SLICE
@@ -156,9 +155,6 @@ cdef extern from "libavcodec/avcodec.h" nogil:
156155
FF_COMPLIANCE_UNOFFICIAL
157156
FF_COMPLIANCE_EXPERIMENTAL
158157

159-
cdef enum:
160-
FF_PROFILE_UNKNOWN = -99
161-
162158
cdef enum AVCodecID:
163159
AV_CODEC_ID_NONE
164160
AV_CODEC_ID_MPEG2VIDEO

include/libavfilter/avfilter.pxd

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,12 @@ cdef extern from "libavfilter/avfilter.h" nogil:
1313
cdef unsigned avfilter_filter_pad_count(const AVFilter *filter, int is_output)
1414

1515
cdef struct AVFilter:
16-
AVClass *priv_class
17-
1816
const char *name
1917
const char *description
20-
21-
const int flags
22-
2318
const AVFilterPad *inputs
2419
const AVFilterPad *outputs
25-
int (*process_command)(AVFilterContext *, const char *cmd, const char *arg, char *res, int res_len, int flags)
20+
const AVClass *priv_class
21+
int flags
2622

2723
cdef AVFilter* avfilter_get_by_name(const char *name)
2824
cdef const AVFilter* av_filter_iterate(void **opaque)

include/libavformat/avformat.pxd

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ cdef extern from "libavformat/avformat.h" nogil:
125125
AVFMT_NOBINSEARCH
126126
AVFMT_NOGENSEARCH
127127
AVFMT_NO_BYTE_SEEK
128-
AVFMT_ALLOW_FLUSH
129128
AVFMT_TS_NONSTRICT
130129
AVFMT_TS_NEGATIVE
131130
AVFMT_SEEK_TO_PTS
@@ -145,7 +144,6 @@ cdef extern from "libavformat/avformat.h" nogil:
145144
AVFMT_FLAG_BITEXACT
146145
AVFMT_FLAG_SORT_DTS
147146
AVFMT_FLAG_FAST_SEEK
148-
AVFMT_FLAG_SHORTEST
149147
AVFMT_FLAG_AUTO_BSF
150148

151149
cdef int av_probe_input_buffer(

0 commit comments

Comments
 (0)