summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-10-16 18:26:01 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-10-16 18:26:01 +0000
commit7136bb0105e37607c98a6290a3355f9490a70993 (patch)
treee06e371f38bcadb1dc9d8189f75d2dc5ba65750b /libmpdemux
parentaf21f25f31c0f157d1476f4aa951767a182b2356 (diff)
downloadmpv-7136bb0105e37607c98a6290a3355f9490a70993.tar.bz2
mpv-7136bb0105e37607c98a6290a3355f9490a70993.tar.xz
Move likely/unlikely macros to libmpdemux/demuxer.h where they are used.
config.h should only contain option definitions, no logic. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27786 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demuxer.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h
index edd13c404f..a97f3746db 100644
--- a/libmpdemux/demuxer.h
+++ b/libmpdemux/demuxer.h
@@ -11,6 +11,14 @@
#include "libass/ass_types.h"
#endif
+#ifdef HAVE_BUILTIN_EXPECT
+#define likely(x) __builtin_expect ((x) != 0, 1)
+#define unlikely(x) __builtin_expect ((x) != 0, 0)
+#else
+#define likely(x) (x)
+#define unlikely(x) (x)
+#endif
+
#define MAX_PACKS 4096
#ifdef CONFIG_TV_BSDBT848
#define MAX_PACK_BYTES 0x2000000