diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-04 23:17:52 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-04 23:17:52 +0400 |
commit | 4480edcf312b8d4350201eca047ccdd2c27f8517 (patch) | |
tree | dbca26f831a32c9638f0aab77daaee0eda3caf86 /libavcodec/wmaprodec.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/wmaprodec.c')
-rw-r--r-- | libavcodec/wmaprodec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c index 287c598373..d4fa2e96a8 100644 --- a/libavcodec/wmaprodec.c +++ b/libavcodec/wmaprodec.c @@ -237,7 +237,7 @@ typedef struct WMAProDecodeCtx { *@brief helper function to print the most important members of the context *@param s context */ -static void av_cold dump_context(WMAProDecodeCtx *s) +static av_cold void dump_context(WMAProDecodeCtx *s) { #define PRINT(a, b) av_log(s->avctx, AV_LOG_DEBUG, " %s = %d\n", a, b); #define PRINT_HEX(a, b) av_log(s->avctx, AV_LOG_DEBUG, " %s = %x\n", a, b); |