Re: [Audacity-devel] [PATCH] Restore support for On-Demand based FFmpeg import
A free multi-track audio editor and recorder
Brought to you by:
aosiniao
From: Richard A. <ri...@au...> - 2013-05-25 15:37:11
|
On Mon, 20 May 2013 00:29:38 +0900 Michael Chinen <mc...@gm...> wrote: > On Sun, May 19, 2013 at 11:36 PM, Richard Ash > <ri...@au...> wrote: > > Query on the #if line: > > As far as I know, DISABLE_DYNAMIC_LOADING_FFMPEG is about > > dynamic linking to libav* rather than dlopen()ing it at runtime, so > > I'm not clear why you need to depend on it here? I would expect it > > to only be defined when USE_FFMPEG is also defined, as we have > > ffmpeg available to use. > > Ah, I wasn't familiar with that #define. I only saw that the greying > out of the FFmpeg lib path prefs used the same #if and copied it so > the behavior was consistent with the lib disable, but now I see that > was wrong if they can still use ffmpeg. > > Updated patch only depends on USE_FFMPEG. Looks good. I've re-arranged the #if and #includes in this file a bit, because I'm convinced it gives differed order of inclusion with and without precompiled headers they way it was. So the precompiled header stuff is now all together, matching the blocks in a few other files I looked at, e.g. DeviceManager.cpp The code change is fine, but I don't know if we should be re-enabling on-demand ffmpeg (in experimental.h) at this point? I can't easily test on Linux because of the version issue, so I haven't committed the change to Experimental.h yet. Richard |