1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-08 16:54:03 +02:00
FFmpeg/libavcodec
Michael Niedermayer 4480edcf31 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>
2012-04-04 21:17:52 +02:00
..
2012-03-27 11:58:15 -04:00
2012-04-04 17:44:21 +02:00
2012-03-22 20:44:24 +01:00
2012-04-01 16:11:29 +02:00
2012-03-22 13:41:48 +01:00
2012-03-23 00:50:43 +01:00
2012-03-28 02:34:06 +02:00
2012-03-26 22:22:51 +02:00
2012-03-31 23:31:56 +02:00
2012-03-30 20:10:39 +02:00
2012-03-24 23:35:09 +01:00
2012-03-28 16:27:08 -06:00
2012-03-24 14:54:12 +01:00
2012-03-26 15:29:14 +02:00
2012-04-03 15:48:53 -04:00
2012-04-01 22:28:24 +02:00
2012-03-24 17:48:03 +01:00
2012-03-31 18:25:44 +02:00
2012-04-01 21:58:29 +02:00
2012-03-25 12:24:15 +02:00
2012-03-28 10:44:43 +02:00
2012-03-27 20:08:41 +02:00