Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 30 Jun 2013 19:18:12 +0000 (21:18 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 30 Jun 2013 19:18:17 +0000 (21:18 +0200)
commitb00e56bec5f8aea788f3565cec09bcfea0aa4a53
tree2a69a4813dee01269febde30bf5bcdc2c14e9452
parent247425241cb3b2b76df1c2aced5ce0d56126b82d
parentf803e0dc0e75997ecb696521cd68d8aeb3cdac40
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>