aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/common.h
diff options
context:
space:
mode:
authorFabrice Bellard <fabrice@bellard.org>2001-07-23 20:06:54 +0000
committerFabrice Bellard <fabrice@bellard.org>2001-07-23 20:06:54 +0000
commit980fc7b83458fe6bbd58910813ba7ad3faf6cf76 (patch)
tree54215c0a4172d6a0490478d6e83685c0851884e7 /libavcodec/common.h
parentd78647e8b4ae46352d689179079a65cc7e1d1efe (diff)
downloadffmpeg-980fc7b83458fe6bbd58910813ba7ad3faf6cf76.tar.gz
fixed config for direct mplayer build compatibility
Originally committed as revision 8 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/common.h')
-rw-r--r--libavcodec/common.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/common.h b/libavcodec/common.h
index bba7d1fb9d..3b46035a64 100644
--- a/libavcodec/common.h
+++ b/libavcodec/common.h
@@ -3,8 +3,8 @@
#include "../config.h"
-#ifndef USE_LIBAVCODEC
-// workaround for typedef conflict in MPlayer
+#ifndef __WINE_WINDEF16_H
+/* workaround for typedef conflict in MPlayer (wine typedefs) */
typedef unsigned short UINT16;
typedef signed short INT16;
#endif