diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-12 11:59:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-12 12:07:14 +0200 |
| commit | c6953589f9c48a7420ea4284f404fb656ddf869f (patch) | |
| tree | 9c7889e947ace75e0f2a9485fd3ea54ff9a8e717 | |
| parent | 161047f010b1d9dbc153a71c1ee75dc2a34561de (diff) | |
| parent | ef5b70affc6376bfeadd1ff649b79bad9a124fa8 (diff) | |
| download | ffmpeg-c6953589f9c48a7420ea4284f404fb656ddf869f.tar.gz | |
Merge commit 'ef5b70affc6376bfeadd1ff649b79bad9a124fa8'
* commit 'ef5b70affc6376bfeadd1ff649b79bad9a124fa8':
configure: Check for support for labels in the inline assembly
The timer code is not placed under ifdef as ours does not use labels
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | libavutil/ppc/timer.h | 2 |
2 files changed, 5 insertions, 0 deletions
@@ -1465,6 +1465,7 @@ HAVE_LIST=" ibm_asm inet_aton io_h + inline_asm_labels isatty jack_port_get_latency_range kbhit @@ -3787,6 +3788,8 @@ unsigned int endian = 'B' << 24 | 'I' << 16 | 'G' << 8 | 'E'; EOF od -t x1 $TMPO | grep -q '42 *49 *47 *45' && enable bigendian +check_inline_asm inline_asm_labels '"1:\n"' + if enabled alpha; then check_cflags -mieee diff --git a/libavutil/ppc/timer.h b/libavutil/ppc/timer.h index 9ade7f5d03..b28e624566 100644 --- a/libavutil/ppc/timer.h +++ b/libavutil/ppc/timer.h @@ -23,6 +23,8 @@ #include <stdint.h> +#include "config.h" + #define AV_READ_TIME read_time static inline uint64_t read_time(void) |