Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 21:39:52 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Ensure that it will use ffmpeg from ppsspp, not from the system.

Browse Source
This commit is contained in:
sergiobenrocha2 2015-02-03 17:46:51 -02:00
parent 414b89f61a
commit 9dbd18e59d
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Core/HLE/sceAtrac.cpp
View File

@ -91,9 +91,9 @@ static const int atracDecodeDelay = 2300;
#ifdef USE_FFMPEG
extern "C" {
#include <libavformat/avformat.h>
#include <libswresample/swresample.h>
#include <libavutil/samplefmt.h>
#include "libavformat/avformat.h"
#include "libswresample/swresample.h"
#include "libavutil/samplefmt.h"
}
#endif // USE_FFMPEG

4
Core/HLE/sceMpeg.cpp
View File

@ -95,8 +95,8 @@ static bool pmp_oldStateLoaded = false; // for dostate
#ifdef USE_FFMPEG
extern "C" {
#include <libavformat/avformat.h>
#include <libswscale/swscale.h>
#include "libavformat/avformat.h"
#include "libswscale/swscale.h"
}
static AVPixelFormat pmp_want_pix_fmt;

6
Core/HW/SimpleAudioDec.cpp
View File

@ -26,9 +26,9 @@
#ifdef USE_FFMPEG
extern "C" {
#include <libavformat/avformat.h>
#include <libswresample/swresample.h>
#include <libavutil/samplefmt.h>
#include "libavformat/avformat.h"
#include "libswresample/swresample.h"
#include "libavutil/samplefmt.h"
}
#endif // USE_FFMPEG