Conflicts fixed

This commit is contained in:
Nekotekina 2014-03-06 15:50:45 +04:00
parent e86a849600
commit 05c6a96d27
22 changed files with 501 additions and 132 deletions

View file

@ -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"