• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 4480edcf
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    4480edcf
fbdev.c 9.12 KB