summaryrefslogtreecommitdiffstats
path: root/libmpcodecs/vd_ijpg.c
diff options
context:
space:
mode:
authorpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-03-11 20:13:45 +0000
committerpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-03-11 20:13:45 +0000
commit9bd7609ccd4af371f7a98d36e1480c9100ae6c0c (patch)
tree48c4b63130d12a7426d179d728272f16826dd527 /libmpcodecs/vd_ijpg.c
parent25cc3ede41c33daa35b8d087d02baa352db25645 (diff)
downloadmpv-9bd7609ccd4af371f7a98d36e1480c9100ae6c0c.tar.bz2
mpv-9bd7609ccd4af371f7a98d36e1480c9100ae6c0c.tar.xz
libjpeg and loader conflict workaround
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5049 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs/vd_ijpg.c')
-rw-r--r--libmpcodecs/vd_ijpg.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libmpcodecs/vd_ijpg.c b/libmpcodecs/vd_ijpg.c
index e8648dbc77..4229e02393 100644
--- a/libmpcodecs/vd_ijpg.c
+++ b/libmpcodecs/vd_ijpg.c
@@ -6,6 +6,8 @@
#include "mp_msg.h"
#include <jpeglib.h>
+#define UINT16 IJPG_UINT16
+#define INT16 IJPG_INT16
#include <setjmp.h>