Merge commit 'ef5b70affc6376bfeadd1ff649b79bad9a124fa8'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Jul 2013 09:59:45 +0000 (11:59 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Jul 2013 10:07:14 +0000 (12:07 +0200)
commitc6953589f9c48a7420ea4284f404fb656ddf869f
tree9c7889e947ace75e0f2a9485fd3ea54ff9a8e717
parent161047f010b1d9dbc153a71c1ee75dc2a34561de
parentef5b70affc6376bfeadd1ff649b79bad9a124fa8
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>
configure
libavutil/ppc/timer.h