diff --git a/core/audio_provider_lavc.cpp b/core/audio_provider_lavc.cpp index f9a4f03fb..0ab46fab8 100644 --- a/core/audio_provider_lavc.cpp +++ b/core/audio_provider_lavc.cpp @@ -44,9 +44,9 @@ #include "options.h" LAVCAudioProvider::LAVCAudioProvider(wxString _filename, VideoProvider *vpro) -try : lavcfile(NULL), codecContext(NULL), rsct(NULL), buffer(NULL) { + try { #if 0 /* since seeking currently is likely to be horribly broken with two * providers accessing the same stream, this is disabled for now. @@ -96,9 +96,11 @@ try buffer = (int16_t *)malloc(AVCODEC_MAX_AUDIO_FRAME_SIZE); if (!buffer) throw _T("Out of memory"); -} catch (...) { - Destroy(); - throw; + + } catch (...) { + Destroy(); + throw; + } } diff --git a/core/audio_provider_lavc.h b/core/audio_provider_lavc.h index a855b59a6..73f92d0f6 100644 --- a/core/audio_provider_lavc.h +++ b/core/audio_provider_lavc.h @@ -41,6 +41,7 @@ #ifdef USE_LAVC +#define EMULATE_INTTYPES #include "audio_provider.h" #include "lavc_file.h"