# HG changeset patch # User pontscho # Date 1015877625 0 # Node ID 2f53b53385e2f5605de5534d3c467f0c5d8fa374 # Parent 2c0b97e0293e9de272b5091dfe369840b82b4a5a libjpeg and loader conflict workaround diff -r 2c0b97e0293e -r 2f53b53385e2 libmpcodecs/vd_ijpg.c --- a/libmpcodecs/vd_ijpg.c Mon Mar 11 09:24:09 2002 +0000 +++ b/libmpcodecs/vd_ijpg.c Mon Mar 11 20:13:45 2002 +0000 @@ -6,6 +6,8 @@ #include "mp_msg.h" #include +#define UINT16 IJPG_UINT16 +#define INT16 IJPG_INT16 #include