diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2010-04-24 20:35:16 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2010-04-24 20:35:16 +0400 |
| commit | 5b4e62a977ba1cbe0f2b66a28c5a228da3b9faa6 (patch) | |
| tree | dbf282ecadd80c101196afe66a6c35dd7c399f85 /intern | |
| parent | 87d30fdd247a205ccb76cee1f7cf6547df46a606 (diff) | |
Fix for #22135, loading ffmpeg now before .B25.blend is loaded.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/audaspace/intern/AUD_C-API.cpp | 6 | ||||
| -rw-r--r-- | intern/audaspace/intern/AUD_C-API.h | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/intern/audaspace/intern/AUD_C-API.cpp b/intern/audaspace/intern/AUD_C-API.cpp index f7394e36c4d..32cfd2098b0 100644 --- a/intern/audaspace/intern/AUD_C-API.cpp +++ b/intern/audaspace/intern/AUD_C-API.cpp @@ -84,11 +84,15 @@ static AUD_IDevice* AUD_device = NULL; static int AUD_available_devices[4]; static AUD_I3DDevice* AUD_3ddevice = NULL; -int AUD_init(AUD_DeviceType device, AUD_DeviceSpecs specs, int buffersize) +void AUD_initOnce() { #ifdef WITH_FFMPEG av_register_all(); #endif +} + +int AUD_init(AUD_DeviceType device, AUD_DeviceSpecs specs, int buffersize) +{ AUD_IDevice* dev = NULL; if(AUD_device) diff --git a/intern/audaspace/intern/AUD_C-API.h b/intern/audaspace/intern/AUD_C-API.h index a7372c29885..55aed02153f 100644 --- a/intern/audaspace/intern/AUD_C-API.h +++ b/intern/audaspace/intern/AUD_C-API.h @@ -56,6 +56,11 @@ typedef struct #endif /** + * Initializes FFMPEG if it is enabled. + */ +extern void AUD_initOnce(); + +/** * Initializes an audio device. * \param device The device type that should be used. * \param specs The audio specification to be used. |