Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FFmpeg 6 support #4419

Merged
merged 3 commits into from
Mar 24, 2023
Merged

FFmpeg 6 support #4419

merged 3 commits into from
Mar 24, 2023

Conversation

crsib
Copy link
Contributor

@crsib crsib commented Mar 16, 2023

Resolves: #4381

(short description of the changes and the motivation to make the changes)

  • I signed CLA
  • The title of the pull request describes an issue it addresses
  • If changes are extensive, then there is a sequence of easily reviewable commits
  • Each commit's message describes its purpose and effects
  • There are no behavior changes unnecessary for the stated purpose of the PR

Recommended:

  • Each commit compiles and runs on my machine without known undesirable changes of behavior

@crsib crsib self-assigned this Mar 16, 2023
@@ -0,0 +1,37 @@
extern "C"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No top-of file banner, which analogous files for version 55 do have, but other versions don't have.

impl/avcodec/60/AVCodecIDLookup.cpp
impl/avcodec/60/AVCodecImpl.cpp
impl/avformat/60/AVFormatImpl.cpp
impl/avutil/58/AVUtilImpl.cpp
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see a mix of "58" and "60" here which I assume is intended

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But maybe this will surprise a future reader and a bit of comment might help

@@ -0,0 +1,37 @@
extern "C"
{
#include "../../avutil/58/avconfig.h"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

60 using 58 again, comment ?

Copy link
Contributor Author

@crsib crsib Mar 22, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This files are literally copied, none of the original files has a comment about different versions between avutil and the rest of the libraries.

The difference between versions is due to the difference inside the FFmpeg itself. I wonder why it is, but I don't quite know :-)

@@ -0,0 +1,46 @@
extern "C"
{
#include "../../avutil/58/avconfig.h"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto


extern "C"
{
#include "../../avutil/58/avconfig.h"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or maybe not? ... maybe this difference of number is just frequent in all the other versions too. I'm comparing with 55 for instance.

@crsib crsib merged commit deaa833 into audacity:master Mar 24, 2023
@crsib crsib deleted the avformat_60 branch March 24, 2023 15:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add support for ffmpeg 6
2 participants