Upgrade FFmpeg from 4.4 to 6.1 #3217
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
viambot
added
the
safe to test
bazile-clyde
commented
Nov 9, 2023
| @@ -1,12 +0,0 @@ | |||
| # Include static libraries | |||
There was a problem hiding this comment.
I removed this and just did this in the Makefile since it's simpler and this was giving me issues.
bazile-clyde
commented
Nov 9, 2023
| @@ -177,11 +177,6 @@ func (ctxt *Context) Close() int { | |||
| return int(C.avcodec_close((*C.struct_AVCodecContext)(ctxt))) | |||
| } | |||
|
|
|||
| // Free frees the AVPacket | |||
| func (p *Packet) Free() { | |||
| C.av_free_packet((*C.struct_AVPacket)(p)) | |||
There was a problem hiding this comment.
From https://github.com/FFmpeg/FFmpeg/blob/96d2a40b9ee0ddd1844b82c23a074804c316caa5/doc/APIchanges#L1512
2015-10-29 - lavc 57.12.100 / 57.8.0 - avcodec.h
xxxxxx - Deprecate av_free_packet(). Use av_packet_unref() as replacement,
it resets the packet in a more consistent way.
bazile-clyde
commented
Nov 9, 2023
Comment on lines
-272
to
-273
| C.av_register_all() | ||
| C.avcodec_register_all() |
There was a problem hiding this comment.
From leandromoreira/ffmpeg-libav-tutorial#29
You can just omit this function call in ffmpeg 4.0 and later.
bazile-clyde
added
appimage
seanavery
approved these changes
Nov 9, 2023
bazile-clyde
added
appimage
viambot
added
safe to test
bazile-clyde
added
appimage
bazile-clyde
added
appimage
Code Coverage
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This updates the version of FFmpeg we depend on from 4.4 to 6.1 (latest). I only had to delete three deprecated functions to upgrade. The only thing you need to look at are the handful of changes in the Makefile, avcodec.go, and avutil.go. It should be straightforward. I tested on RPi and a Linux amd64.
Important
No need to review FFmpeg source files.