summaryrefslogtreecommitdiff
path: root/src/libffmpeg/libavcodec/common.h
diff options
context:
space:
mode:
authorDaniel Caujolle-Bert <f1rmb@users.sourceforge.net>2004-03-17 20:24:16 +0000
committerDaniel Caujolle-Bert <f1rmb@users.sourceforge.net>2004-03-17 20:24:16 +0000
commitae109a53230445270ecddb9cd158ed65dfbae8c8 (patch)
tree05cd9db63e15e72cafdea765a9786dcb9bb9c79d /src/libffmpeg/libavcodec/common.h
parent93a7ebc4f4f5c3b4086f9e23fb508963ff123dd7 (diff)
downloadxine-lib-ae109a53230445270ecddb9cd158ed65dfbae8c8.tar.gz
xine-lib-ae109a53230445270ecddb9cd158ed65dfbae8c8.tar.bz2
fix ffmpeg breakage
CVS patchset: 6283 CVS date: 2004/03/17 20:24:16
Diffstat (limited to 'src/libffmpeg/libavcodec/common.h')
-rw-r--r--src/libffmpeg/libavcodec/common.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libffmpeg/libavcodec/common.h b/src/libffmpeg/libavcodec/common.h
index a5c67d3a7..59b128cef 100644
--- a/src/libffmpeg/libavcodec/common.h
+++ b/src/libffmpeg/libavcodec/common.h
@@ -1286,6 +1286,7 @@ tend= rdtsc();\
#define CLAMP_TO_8BIT(d) ((d > 0xff) ? 0xff : (d < 0) ? 0 : d)
/* avoid usage of various functions */
+#if 0
#define malloc please_use_av_malloc
#define free please_use_av_free
#define realloc please_use_av_realloc
@@ -1293,6 +1294,7 @@ tend= rdtsc();\
#define printf please_use_av_log
#define fprintf please_use_av_log
#endif
+#endif
#define CHECKED_ALLOCZ(p, size)\
{\