Revert "make PixelFormat a typedef, fixes ffmpeg 1.1 compat"
This reverts commit 4537a66481.
Apparently broke build on Windows somehow.
This commit is contained in:
@@ -21,8 +21,6 @@
|
||||
extern "C"
|
||||
{
|
||||
#include <libavcodec/avcodec.h>
|
||||
#undef PixelFormat
|
||||
typedef AVPixelFormat PixelFormat;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
@@ -16,8 +16,6 @@ namespace avcodec
|
||||
#include <libavformat/avformat.h>
|
||||
#include <libswscale/swscale.h>
|
||||
#include <libavutil/pixdesc.h>
|
||||
#undef PixelFormat
|
||||
typedef AVPixelFormat PixelFormat;
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user