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/h264.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/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 10f0f24cd9..fc612905ab 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2408,17 +2408,17 @@ hl_decode_mb_simple(1, 16) /** * Process a macroblock; this handles edge cases, such as interlacing. */ -static void av_noinline hl_decode_mb_complex(H264Context *h) +static av_noinline void hl_decode_mb_complex(H264Context *h) { hl_decode_mb_internal(h, 0, h->pixel_shift); } -static void av_noinline hl_decode_mb_444_complex(H264Context *h) +static av_noinline void hl_decode_mb_444_complex(H264Context *h) { hl_decode_mb_444_internal(h, 0, h->pixel_shift); } -static void av_noinline hl_decode_mb_444_simple(H264Context *h) +static av_noinline void hl_decode_mb_444_simple(H264Context *h) { hl_decode_mb_444_internal(h, 1, 0); } |