diff options
Diffstat (limited to 'common/common.h')
| -rw-r--r-- | common/common.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/common/common.h b/common/common.h index cc7093a4fc..8edfc96d23 100644 --- a/common/common.h +++ b/common/common.h @@ -24,7 +24,7 @@ #include <stdint.h> #include "osdep/compiler.h" -#include "talloc.h" +#include "mpv_talloc.h" // double should be able to represent this exactly #define MP_NOPTS_VALUE (-0x1p+63) @@ -32,8 +32,6 @@ #define MP_CONCAT_(a, b) a ## b #define MP_CONCAT(a, b) MP_CONCAT_(a, b) -#define ROUND(x) ((int)((x) < 0 ? (x) - 0.5 : (x) + 0.5)) - #define MPMAX(a, b) ((a) > (b) ? (a) : (b)) #define MPMIN(a, b) ((a) > (b) ? (b) : (a)) #define MPCLAMP(a, min, max) (((a) < (min)) ? (min) : (((a) > (max)) ? (max) : (a))) @@ -92,4 +90,7 @@ bool mp_append_escaped_string(void *talloc_ctx, struct bstr *dst, char *mp_strerror_buf(char *buf, size_t buf_size, int errnum); #define mp_strerror(e) mp_strerror_buf((char[80]){0}, 80, e) +char *mp_tag_str_buf(char *buf, size_t buf_size, uint32_t tag); +#define mp_tag_str(t) mp_tag_str_buf((char[22]){0}, 22, t) + #endif /* MPLAYER_MPCOMMON_H */ |