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
This commit is contained in:
diego 2008-10-16 18:26:01 +00:00
parent af21f25f31
commit 7136bb0105
2 changed files with 8 additions and 7 deletions

7
configure vendored
View File

@ -8166,13 +8166,6 @@ $_def_restrict_keyword
/* __builtin_expect branch prediction hint */
$_def_builtin_expect
#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
/* compiler support for named assembler arguments */
$_def_named_asm_args

View File

@ -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