diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-30 21:18:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-30 21:18:17 +0200 |
| commit | b00e56bec5f8aea788f3565cec09bcfea0aa4a53 (patch) | |
| tree | 2a69a4813dee01269febde30bf5bcdc2c14e9452 /libavutil | |
| parent | 247425241cb3b2b76df1c2aced5ce0d56126b82d (diff) | |
| parent | f803e0dc0e75997ecb696521cd68d8aeb3cdac40 (diff) | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Support compilation on aix with gcc.
Rename "AVClass class" as "AVClass component_class".
Rename constant FRAMESIZE in ra144 codec as FRAME_SIZE.
Rename thread_init() in libavcodec and libavfilter as library_thread_init().
Rename constant HZ in af_biquads.c as HERTZ.
Drop local lable from ppc asm timer.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/eval.c | 4 | ||||
| -rw-r--r-- | libavutil/ppc/timer.h | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/libavutil/eval.c b/libavutil/eval.c index 3abc3e5a88..9b1458c89b 100644 --- a/libavutil/eval.c +++ b/libavutil/eval.c @@ -52,7 +52,7 @@ typedef struct Parser { double *var; } Parser; -static const AVClass class = { "Eval", av_default_item_name, NULL, LIBAVUTIL_VERSION_INT, offsetof(Parser,log_offset), offsetof(Parser,log_ctx) }; +static const AVClass eval_class = { "Eval", av_default_item_name, NULL, LIBAVUTIL_VERSION_INT, offsetof(Parser,log_offset), offsetof(Parser,log_ctx) }; static const int8_t si_prefixes['z' - 'E' + 1] = { ['y'-'E']= -24, @@ -657,7 +657,7 @@ int av_expr_parse(AVExpr **expr, const char *s, if (!av_isspace(*s++)) *wp++ = s[-1]; *wp++ = 0; - p.class = &class; + p.class = &eval_class; p.stack_index=100; p.s= w; p.const_names = const_names; diff --git a/libavutil/ppc/timer.h b/libavutil/ppc/timer.h index 155fc01507..9ade7f5d03 100644 --- a/libavutil/ppc/timer.h +++ b/libavutil/ppc/timer.h @@ -31,12 +31,11 @@ static inline uint64_t read_time(void) /* from section 2.2.1 of the 32-bit PowerPC PEM */ __asm__ volatile( - "1:\n" "mftbu %2\n" "mftb %0\n" "mftbu %1\n" "cmpw %2,%1\n" - "bne 1b\n" + "bne $-0x10\n" : "=r"(tbl), "=r"(tbu), "=r"(temp) : : "cc"); |