highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'ef5b70affc6376bfeadd1ff649b79bad9a124fa8'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer 2013-07-12 11:59:45 +02:00
commit c6953589f9
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure vendored
View File

@ -1465,6 +1465,7 @@ HAVE_LIST="
ibm_asm ibm_asm
inet_aton inet_aton
io_h io_h
inline_asm_labels
isatty isatty
jack_port_get_latency_range jack_port_get_latency_range
kbhit kbhit
@ -3787,6 +3788,8 @@ unsigned int endian = 'B' << 24 | 'I' << 16 | 'G' << 8 | 'E';
EOF EOF
od -t x1 $TMPO | grep -q '42 *49 *47 *45' && enable bigendian od -t x1 $TMPO | grep -q '42 *49 *47 *45' && enable bigendian
check_inline_asm inline_asm_labels '"1:\n"'
if enabled alpha; then if enabled alpha; then
check_cflags -mieee check_cflags -mieee

2
libavutil/ppc/timer.h
View File

@ -23,6 +23,8 @@
#include <stdint.h> #include <stdint.h>
#include "config.h"
#define AV_READ_TIME read_time #define AV_READ_TIME read_time
static inline uint64_t read_time(void) static inline uint64_t read_time(void)