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/ffv1.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/ffv1.c')
| -rw-r--r-- | libavcodec/ffv1.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c index b251c8bf87..c9ea822668 100644 --- a/libavcodec/ffv1.c +++ b/libavcodec/ffv1.c @@ -328,7 +328,7 @@ do{\ #undef put_rac } -static void av_noinline put_symbol(RangeCoder *c, uint8_t *state, int v, int is_signed){ +static av_noinline void put_symbol(RangeCoder *c, uint8_t *state, int v, int is_signed){ put_symbol_inline(c, state, v, is_signed, NULL, NULL); } @@ -352,7 +352,7 @@ static inline av_flatten int get_symbol_inline(RangeCoder *c, uint8_t *state, in } } -static int av_noinline get_symbol(RangeCoder *c, uint8_t *state, int is_signed){ +static av_noinline int get_symbol(RangeCoder *c, uint8_t *state, int is_signed){ return get_symbol_inline(c, state, is_signed); } |