Skip to content

Commit 08903f1

Browse files
authored
Merge pull request #33 from mutablelogic/ffmpeg61
Updated go-media for nil frames
2 parents b02b78a + 4254090 commit 08903f1

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

go.mod

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
module github.com/mutablelogic/go-media
22

3-
go 1.20
3+
go 1.22
4+
5+
toolchain go1.22.3
46

57
require (
6-
github.com/alecthomas/kong v0.9.0
78
github.com/djthorpe/go-errors v1.0.3
8-
github.com/djthorpe/go-tablewriter v0.0.8
99
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0
1010
github.com/llgcode/draw2d v0.0.0-20240627062922-0ed1ff131195
1111
github.com/mutablelogic/go-client v1.0.8
@@ -16,11 +16,7 @@ require (
1616

1717
require (
1818
github.com/davecgh/go-spew v1.1.1 // indirect
19-
github.com/mattn/go-runewidth v0.0.15 // indirect
2019
github.com/pmezard/go-difflib v1.0.0 // indirect
21-
github.com/rivo/uniseg v0.4.7 // indirect
2220
golang.org/x/image v0.18.0 // indirect
23-
golang.org/x/sys v0.21.0 // indirect
24-
golang.org/x/term v0.21.0 // indirect
2521
gopkg.in/yaml.v3 v3.0.1 // indirect
2622
)

pkg/ffmpeg/decoder.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,11 @@ func (d *Decoder) decode(packet *ff.AVPacket, fn DecoderFrameFn) error {
156156
}
157157

158158
// Copy across the timebase and pts
159-
(*ff.AVFrame)(dest).SetPts(d.frame.Pts())
160-
(*ff.AVFrame)(dest).SetTimeBase(d.timeBase)
159+
// TODO if dest != nil {
160+
// fmt.Println("pts=", d.frame.Pts())
161+
// (*ff.AVFrame)(dest).SetPts(d.frame.Pts())
162+
// (*ff.AVFrame)(dest).SetTimeBase(d.timeBase)
163+
//}
161164

162165
// Pass back to the caller
163166
if err := fn(d.stream, dest); errors.Is(err, io.EOF) {

0 commit comments

Comments
 (0)