Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 4 Apr 2012 19:17:52 +0000 (21:17 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 4 Apr 2012 19:17:52 +0000 (21:17 +0200)
commit4480edcf312b8d4350201eca047ccdd2c27f8517
treedbca26f831a32c9638f0aab77daaee0eda3caf86
parent6cecb8915aa8fa8b55f494f9dd05cce1a4c36093
parent91dffb4c1dfc7232e74ab86536afe39a777fc12d
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>
15 files changed:
libavcodec/aacdec.c
libavcodec/arm/dcadsp_init_arm.c
libavcodec/arm/dsputil_init_armv5te.c
libavcodec/arm/dsputil_init_armv6.c
libavcodec/ffv1.c
libavcodec/fmtconvert.h
libavcodec/h264.c
libavcodec/ivi_common.c
libavcodec/mpegaudiodsp_template.c
libavcodec/pcm.c
libavcodec/tiffenc.c
libavcodec/wmaprodec.c
libavdevice/fbdev.c
libavformat/rtmpproto.c
libavutil/lfg.c