actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert "make PixelFormat a typedef, fixes ffmpeg 1.1 compat"

Browse Source 
This reverts commit 4537a66481.

Apparently broke build on Windows somehow.
This commit is contained in:
Devin J. Pohly
2013-02-20 16:23:04 -05:00
parent 4537a66481
commit a6bfbb19ac
2 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/arch/ArchHooks/ArchHooks_Unix.cpp
-2
View File
@@ -21,8 +21,6 @@
extern "C" extern "C"
{ {
#include <libavcodec/avcodec.h> #include <libavcodec/avcodec.h>
#undef PixelFormat
typedef AVPixelFormat PixelFormat;
} }
#endif #endif
src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
-2
View File
@@ -16,8 +16,6 @@ namespace avcodec
#include <libavformat/avformat.h> #include <libavformat/avformat.h>
#include <libswscale/swscale.h> #include <libswscale/swscale.h>
#include <libavutil/pixdesc.h> #include <libavutil/pixdesc.h>
#undef PixelFormat
typedef AVPixelFormat PixelFormat;
} }
}; };