[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'
Michael Niedermayer
git at videolan.org
Wed Apr 4 21:33:49 CEST 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 4 21:17:52 2012 +0200| [4480edcf312b8d4350201eca047ccdd2c27f8517] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4480edcf312b8d4350201eca047ccdd2c27f8517
---
More information about the ffmpeg-cvslog
mailing list