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

AVIDump: use new ffmpeg/libav API #362

Merged
merged 6 commits into from
Jul 6, 2014

Conversation

Tilka
Copy link
Member

@Tilka Tilka commented May 12, 2014

libav 10 has been released on May 10th, 2014 (it drops support for some
long-deprecated stuff).

Can someone test this on Debian unstable?

Problem: Debian stable only ships the new API in backports.

@Tilka
Copy link
Member Author

Tilka commented May 12, 2014

Seems like our GitHub integration is still a bit buggy...

@pinumbernumber
Copy link
Contributor

../Source/Core/VideoCommon/AVIDump.cpp: In static member function ‘static bool AVIDump::CreateFile()’:
../Source/Core/VideoCommon/AVIDump.cpp:263:24: error: ‘CODEC_ID_FFV1’ was not declared in this scope
g_Config.bUseFFV1 ?  CODEC_ID_FFV1 : s_FormatContext->oformat->video_codec;
                        ^
../Source/Core/VideoCommon/AVIDump.cpp: In static member function ‘static void AVIDump::CloseFile()’:
../Source/Core/VideoCommon/AVIDump.cpp:365:27: error: cannot convert ‘AVFrame*’ to ‘AVFrame**’ for argument ‘1’ to ‘void av_frame_free(AVFrame**)’
av_frame_free(s_BGRFrame);
                        ^
../Source/Core/VideoCommon/AVIDump.cpp:369:27: error: cannot convert ‘AVFrame*’ to ‘AVFrame**’ for argument ‘1’ to ‘void av_frame_free(AVFrame**)’
av_frame_free(s_YUVFrame);
                        ^
ninja: build stopped: subcommand failed.

Note that I'm a bit of a debian newbie, I might very well be doing something wrong

@Tilka
Copy link
Member Author

Tilka commented May 13, 2014

@pinumbernumber: How about now?

@pinumbernumber
Copy link
Contributor

@Tilka: Sorry for the delay, yes it builds now. Thanks for fixing it

@Tilka
Copy link
Member Author

Tilka commented May 14, 2014

(Squashed.)

@Tilka
Copy link
Member Author

Tilka commented May 14, 2014

Doesn't work yet, closing for now.

@Tilka Tilka closed this May 14, 2014
@delroth
Copy link
Member

delroth commented May 14, 2014

Reopening for buildbot test.

@delroth delroth reopened this May 14, 2014
@delroth
Copy link
Member

delroth commented May 14, 2014

@dolphin-emu-bot rebuild

@shuffle2
Copy link
Contributor

Er, was this reopened just to test the buildbot, and is not intended to be merged (ever)...or what?

@matthewharvey
Copy link

Is this going to be merged? The build is still broken for me on Debian Jessie.

@Tilka
Copy link
Member Author

Tilka commented Jun 9, 2014

@matthewharvey: The problem is that it doesn't actually work, it only fixes the build.

Closing for now. I'll reopen when I have something that works.

@Tilka Tilka closed this Jun 9, 2014
@Tilka
Copy link
Member Author

Tilka commented Jun 15, 2014

MPEG works now (FFV1 was already broken before).

@Tilka Tilka reopened this Jun 15, 2014
@JMC47
Copy link
Contributor

JMC47 commented Jun 26, 2014

What's the status of the PR? There's a milestone current issue relying on it.

@Tilka
Copy link
Member Author

Tilka commented Jun 27, 2014

@JMC47 FFV1 is still broken. Originally I thought I would somehow stumble upon a fix but that hasn't happened so far. This PR can be merged as it is. Getting compatible with libav 10 was my main concern.

@lioncash
Copy link
Member

Could this be rebased to remove the merge commits and stuff from neobrain/magumagu/delroth, etc?

@Tilka
Copy link
Member Author

Tilka commented Jul 3, 2014

@dolphin-emu-bot rebuild

(This should fail during CMake.)

@Tilka
Copy link
Member Author

Tilka commented Jul 5, 2014

It actually does build correctly when there is no ffmpeg installed or when it's too old.

Please review/merge.

@lioncash
Copy link
Member

lioncash commented Jul 6, 2014

@Tilka: This comment grants you the permission to merge this pull request whenever you think it is ready. After addressing the remaining comments, click this link to merge.


Looks good to me

@dolphin-emu-bot allowmerge

dolphin-emu-bot added a commit that referenced this pull request Jul 6, 2014
AVIDump: use new ffmpeg/libav API
@dolphin-emu-bot dolphin-emu-bot merged commit cc3dda5 into dolphin-emu:master Jul 6, 2014
@Tilka Tilka deleted the ffmpeg_libav_new branch July 6, 2014 17:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
8 participants