Merge commit 'b78b10c4b78b696927f2801cf2d9f193b4eff28b'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Aug 2013 12:04:29 +0000 (14:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Aug 2013 12:05:15 +0000 (14:05 +0200)
commitc83d794936b2adacbdd7fee12cf14439a9ed2689
tree19bec339467dd18ef5fffb164a6172d6d36c089f
parent18a9deedb0b0da2d6675e14ecbb270477b7186b7
parentb78b10c4b78b696927f2801cf2d9f193b4eff28b
Merge commit 'b78b10c4b78b696927f2801cf2d9f193b4eff28b'

* commit 'b78b10c4b78b696927f2801cf2d9f193b4eff28b':
  avutil: Move internal CPU detection function declarations to private header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/cpu.c
libavutil/cpu.h
libavutil/cpu_internal.h
libavutil/ppc/cpu.c
libavutil/x86/cpu.c