search

hrydgard / ppsspp-ffmpeg

A slimmed-down build of FFMPEG used in PPSSPP. Includes h.264, atrac3+, AAC and a few other codecs.
Other
62 stars 72 forks source link

Update ffmpeg version on Windows for VS2015 #33

Closed Bigpet closed 9 years ago

Bigpet commented 9 years ago

So this updates ffmpeg to get a version that compiles in VS2015 (at least the libraries do, we don't compile the command line tool anyway).

I tested whether VS2015 could use the libs compiled with VS2013 and it doesn't (linking the stdlib dynamically or statically doesn't matter, it just doesn't work).

I did update the VS2013 libs to the newer version too and added VS2015 versions in the format "avcodec.v140.lib".

Maybe renaming the VS2013 libs to "avcodec.v120.lib" would allow us to use "avcodec.$(PlatformToolset).lib". I just don't see an easy way to automatically output the right name with the windows_XXX-build.sh scripts. The only thing I came across was the %VisualStudioVersion% environment variable in the VSCommandPrompt which is in the format "12.0", so we would use bash to take that, remove the dot and prefix it with ".v"

sergiobenrocha2 commented 9 years ago

PPSSPP should use "stable" releases instead random snapshots...

Does 2.7.1 work on windows?

xsacha commented 9 years ago

For a long time there was no stable release with ATRAC3+ support. I suppose there is one now.

unknownbrackets commented 9 years ago

2.7.1 includes the fairly recent patch to fix ATRAC3+ with GHA phase shifting, afaik. So yes, could update to that. Although, iirc, FFmpeg's policy was always "use the latest svn/git version or don't report issues", not sure if that has changed these days...

-[Unknown]

sergiobenrocha2 commented 9 years ago

With stable release you at least can compare with Arch Linux or Debian Sid, for example (in the case you are using shared libs).

xsacha commented 9 years ago

Is there any distro that has a ffmpeg that supports atrac3+ yet?

unknownbrackets commented 9 years ago

Well, the one they need was literally released last week. If that's a reasonable dependency, then it seems like it ought to be fine to use a shared ffmpeg.

-[Unknown]

sergiobenrocha2 commented 9 years ago

atrac3+ is not enabled in Arch Linux yet? Licensing problem?

Bigpet commented 9 years ago

@sergiobenrocha2 sorry for answering so late but yeah both 2.7.1 and 2.7.2 have the VS2015 changes.

Btw. VS2015 is now released.

About outputting the right name, I guess we don't need to do the generic string manipulation, we could just essentially do the bash equivalent to what wxWidgets does: https://github.com/wxWidgets/wxWidgets/blob/master/build/msw/wx_config.props

But I vaguely remember @hrydgard having some objections to carrying around multiple versions for Windows, I just don't remember the details of that conversation or where it took place

hrydgard commented 9 years ago

Yeah, we will switch to VS2015 soon and rebuild the ffmpeg libs. Might as well update to latest FFMPEG while at it.

My objection to multiple versions is just that the ffmpeg submodule is already ridiculously large.

hrydgard commented 9 years ago

Doing https://github.com/hrydgard/ppsspp-ffmpeg/pull/35 instead.