diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-04 21:17:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-04 21:17:52 +0200 |
| commit | 4480edcf312b8d4350201eca047ccdd2c27f8517 (patch) | |
| tree | dbca26f831a32c9638f0aab77daaee0eda3caf86 /libavcodec/mpegaudiodsp_template.c | |
| parent | 6cecb8915aa8fa8b55f494f9dd05cce1a4c36093 (diff) | |
| parent | 91dffb4c1dfc7232e74ab86536afe39a777fc12d (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
w32threads: Make pthread_cond_wait follow POSIX
cosmetics: Consistently place static, inline and av_cold attributes/keywords.
sbrdsp: Use standard multiple inclusion guards.
pcm: K&R formatting cosmetics
rawdec: Support fourccs YV16 and YV24
rtmp: implement bandwidth notification
rtmp: update supported audio codecs value
Conflicts:
libavcodec/pcm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegaudiodsp_template.c')
| -rw-r--r-- | libavcodec/mpegaudiodsp_template.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpegaudiodsp_template.c b/libavcodec/mpegaudiodsp_template.c index 53b6139da3..8df2ff3079 100644 --- a/libavcodec/mpegaudiodsp_template.c +++ b/libavcodec/mpegaudiodsp_template.c @@ -192,7 +192,7 @@ void RENAME(ff_mpa_synth_filter)(MPADSPContext *s, MPA_INT *synth_buf_ptr, *synth_buf_offset = offset; } -void av_cold RENAME(ff_mpa_synth_init)(MPA_INT *window) +av_cold void RENAME(ff_mpa_synth_init)(MPA_INT *window) { int i, j; |