Skip to content

Commit 7e8829d

Browse files
committed
Fixed version numbers
1 parent 051e2d4 commit 7e8829d

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

manager.go

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package media
22

33
import (
4+
"fmt"
45
"io"
56
"runtime"
67

@@ -311,13 +312,13 @@ func (manager *manager) Write(w io.Writer, format Format, metadata []Metadata, p
311312
// Return version information for the media manager as a set of metadata
312313
func (manager *manager) Version() []Metadata {
313314
metadata := []Metadata{
314-
newMetadata("libavcodec_version", ff.AVCodec_version()),
315-
newMetadata("libavformat_version", ff.AVFormat_version()),
316-
newMetadata("libavutil_version", ff.AVUtil_version()),
317-
newMetadata("libavdevice_version", ff.AVDevice_version()),
315+
newMetadata("libavcodec_version", ffVersionAsString(ff.AVCodec_version())),
316+
newMetadata("libavformat_version", ffVersionAsString(ff.AVFormat_version())),
317+
newMetadata("libavutil_version", ffVersionAsString(ff.AVUtil_version())),
318+
newMetadata("libavdevice_version", ffVersionAsString(ff.AVDevice_version())),
318319
// newMetadata("libavfilter_version", ff.AVFilter_version()),
319-
newMetadata("libswscale_version", ff.SWScale_version()),
320-
newMetadata("libswresample_version", ff.SWResample_version()),
320+
newMetadata("libswscale_version", ffVersionAsString(ff.SWScale_version())),
321+
newMetadata("libswresample_version", ffVersionAsString(ff.SWResample_version())),
321322
}
322323
if version.GitSource != "" {
323324
metadata = append(metadata, newMetadata("git_source", version.GitSource))
@@ -352,3 +353,10 @@ func (manager *manager) Warningf(f string, args ...any) {
352353
func (manager *manager) Infof(f string, args ...any) {
353354
ff.AVUtil_log(nil, ff.AV_LOG_INFO, f, args...)
354355
}
356+
357+
////////////////////////////////////////////////////////////////////////////
358+
// PRIVATE METHODS
359+
360+
func ffVersionAsString(version uint) string {
361+
return fmt.Sprintf("%d.%d.%d", version&0xFF0000>>16, version&0xFF00>>8, version&0xFF)
362+
}

0 commit comments

Comments
 (0)