Skip to content
Snippets Groups Projects
Commit 4480edcf authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

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: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 6cecb891 91dffb4c
No related branches found
No related tags found
No related merge requests found
Showing with 176 additions and 147 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment