diff options
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/audaspace/intern/AUD_SequencerReader.cpp | 10 | ||||
| -rw-r--r-- | intern/ffmpeg/ffmpeg_compat.h | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/intern/audaspace/intern/AUD_SequencerReader.cpp b/intern/audaspace/intern/AUD_SequencerReader.cpp index c8af1161530..23d50c78508 100644 --- a/intern/audaspace/intern/AUD_SequencerReader.cpp +++ b/intern/audaspace/intern/AUD_SequencerReader.cpp @@ -107,8 +107,14 @@ void AUD_SequencerReader::read(int& length, bool& eos, sample_t* buffer) if(result < 0) { - handle = new AUD_SequencerHandle(entry, m_device); - handles.push_front(handle); + try + { + handle = new AUD_SequencerHandle(entry, m_device); + handles.push_front(handle); + } + catch(AUD_Exception&) + { + } eit++; } else if(result == 0) diff --git a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h index a23dd22f932..05299525d67 100644 --- a/intern/ffmpeg/ffmpeg_compat.h +++ b/intern/ffmpeg/ffmpeg_compat.h @@ -29,7 +29,7 @@ /* check our ffmpeg is new enough, avoids user complaints */ #if (LIBAVFORMAT_VERSION_MAJOR < 52) || ((LIBAVFORMAT_VERSION_MAJOR == 52) && (LIBAVFORMAT_VERSION_MINOR <= 64)) -# error "FFmpeg 0.7 or newer is needed, Upgrade you're FFmpeg or disable it" +# error "FFmpeg 0.7 or newer is needed, Upgrade your FFmpeg or disable it" #endif /* end sanity check */ |