header no longer needs avformat.h
This commit is contained in:
@@ -8,6 +8,14 @@
|
|||||||
#include "SDL_utils.h"
|
#include "SDL_utils.h"
|
||||||
#include "SDL_endian.h"
|
#include "SDL_endian.h"
|
||||||
|
|
||||||
|
namespace avcodec
|
||||||
|
{
|
||||||
|
#if defined(_WIN32)
|
||||||
|
#include "ffmpeg/include/ffmpeg/avformat.h"
|
||||||
|
#else
|
||||||
|
#include <ffmpeg/avformat.h>
|
||||||
|
#endif
|
||||||
|
};
|
||||||
|
|
||||||
#if defined(_WIN32)
|
#if defined(_WIN32)
|
||||||
#pragma comment(lib, "ffmpeg/lib/avcodec.lib")
|
#pragma comment(lib, "ffmpeg/lib/avcodec.lib")
|
||||||
|
|||||||
@@ -16,15 +16,6 @@
|
|||||||
#include <inttypes.h>
|
#include <inttypes.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
namespace avcodec
|
|
||||||
{
|
|
||||||
#if defined(_WIN32)
|
|
||||||
#include "ffmpeg/include/ffmpeg/avformat.h"
|
|
||||||
#else
|
|
||||||
#include <ffmpeg/avformat.h>
|
|
||||||
#endif
|
|
||||||
};
|
|
||||||
|
|
||||||
class FFMpeg_Helper;
|
class FFMpeg_Helper;
|
||||||
|
|
||||||
class MovieTexture_FFMpeg: public RageMovieTexture
|
class MovieTexture_FFMpeg: public RageMovieTexture
|
||||||
@@ -65,10 +56,6 @@ private:
|
|||||||
* PAUSE_DECODER: The decoder thread is idle.
|
* PAUSE_DECODER: The decoder thread is idle.
|
||||||
*
|
*
|
||||||
* PLAYING: The decoder thread is running.
|
* PLAYING: The decoder thread is running.
|
||||||
*
|
|
||||||
* PLAYING_ONE: The decoder thread will decode one frame, post the
|
|
||||||
* m_FrameDecoded semaphore and change to the PAUSE_DECODER state.
|
|
||||||
* This is only used by Create().
|
|
||||||
*/
|
*/
|
||||||
enum State { DECODER_QUIT, PAUSE_DECODER, PLAYING } m_State;
|
enum State { DECODER_QUIT, PAUSE_DECODER, PLAYING } m_State;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user