mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-07-10 08:51:28 +12:00
Conflicts fixed
This commit is contained in:
parent
e86a849600
commit
05c6a96d27
22 changed files with 501 additions and 132 deletions
|
@ -7,8 +7,8 @@ extern SMutexGeneral g_mutex_avcodec_open2;
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include "libavcodec\avcodec.h"
|
||||
#include "libavformat\avformat.h"
|
||||
#include "libavcodec/avcodec.h"
|
||||
#include "libavformat/avformat.h"
|
||||
}
|
||||
|
||||
#include "cellAdec.h"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue