Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-05-02 23:08:00 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 32

Fixed up FFMpeg input +test

Browse source
This commit is contained in:
Nicolay Korslund 2010-01-01 20:18:11 +01:00
parent fbb77478c0
commit cdca68a368
5 changed files with 72 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
sound/sources/ffmpeg_source.h
View file

@ -1,8 +1,7 @@
#ifndef MANGLE_SOUND_FFMPEG_H
#define MANGLE_SOUND_FFMPEG_H
#include "../input.h"
#include <exception>
#include "../source.h"
#include <vector>
#include <assert.h>
@ -28,7 +27,7 @@ class FFMpegSource : public SampleSource
FFMpegSource(const std::string &file);
/// Decode the given sound stream (not supported by FFmpeg)
FFMpegSource(Stream::StreamPtr src) { assert(0); }
FFMpegSource(Mangle::Stream::StreamPtr src) { assert(0); }
~FFMpegSource();
@ -40,7 +39,7 @@ class FFMpegSource : public SampleSource
#include "loadertemplate.h"
/// A factory that loads FFMpegSources from file
class FFMpegLoader : public SSL_Template<AudiereSource,false,true>
class FFMpegLoader : public SSL_Template<FFMpegSource,false,true>
{
public: