mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

un-break VC++

Browse source 
Originally committed to SVN as r333.
This commit is contained in:
David Lamparter 2006-04-14 22:56:17 +00:00
parent 366a248a7e
commit 4655ae8122
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/audio_provider_lavc.cpp
View file

@ -44,9 +44,9 @@
#include "options.h" #include "options.h"
LAVCAudioProvider::LAVCAudioProvider(wxString _filename, VideoProvider *vpro) LAVCAudioProvider::LAVCAudioProvider(wxString _filename, VideoProvider *vpro)
try
: lavcfile(NULL), codecContext(NULL), rsct(NULL), buffer(NULL) : lavcfile(NULL), codecContext(NULL), rsct(NULL), buffer(NULL)
{ {
try {
#if 0 #if 0
/* since seeking currently is likely to be horribly broken with two /* since seeking currently is likely to be horribly broken with two
* providers accessing the same stream, this is disabled for now. * providers accessing the same stream, this is disabled for now.
@ -96,9 +96,11 @@ try
buffer = (int16_t *)malloc(AVCODEC_MAX_AUDIO_FRAME_SIZE); buffer = (int16_t *)malloc(AVCODEC_MAX_AUDIO_FRAME_SIZE);
if (!buffer) if (!buffer)
throw _T("Out of memory"); throw _T("Out of memory");
} catch (...) {
} catch (...) {
Destroy(); Destroy();
throw; throw;
}
} }

1
core/audio_provider_lavc.h
View file

@ -41,6 +41,7 @@
#ifdef USE_LAVC #ifdef USE_LAVC
#define EMULATE_INTTYPES
#include "audio_provider.h" #include "audio_provider.h"
#include "lavc_file.h" #include "lavc_file.h"