diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-30 21:18:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-30 21:18:17 +0200 |
| commit | b00e56bec5f8aea788f3565cec09bcfea0aa4a53 (patch) | |
| tree | 2a69a4813dee01269febde30bf5bcdc2c14e9452 /libswresample/audioconvert.c | |
| parent | 247425241cb3b2b76df1c2aced5ce0d56126b82d (diff) | |
| parent | f803e0dc0e75997ecb696521cd68d8aeb3cdac40 (diff) | |
| download | ffmpeg-b00e56bec5f8aea788f3565cec09bcfea0aa4a53.tar.gz | |
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>
Diffstat (limited to 'libswresample/audioconvert.c')
0 files changed, 0 insertions, 0 deletions