1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
FFmpeg/libavformat
Michael Niedermayer 8e2bab5d4b Merge remote-tracking branch 'qatar/master'
* qatar/master:
  drawtext: remove typo
  pcm-mpeg: implement new audio decoding api
  w32thread: port fixes to pthread_cond_broadcast() from x264.
  doc: add editor configuration section with Vim and Emacs settings
  dxva2.h: include d3d9.h to define LPDIRECT3DSURFACE9
  avformat/utils: Drop unused goto label.
  doxygen: Replace '\' by '@' in Doxygen markup tags.
  cosmetics: drop some completely pointless parentheses
  cljr: simplify CLJRContext
  drawtext: introduce rand(min, max)
  drawtext: introduce explicit draw/hide variable
  rtmp: Use nb_invokes for all invoke commands

Conflicts:
	libavcodec/mpegvideo.c
	libavfilter/vf_drawtext.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-08 00:23:37 +01:00
..
2011-11-30 20:34:45 +01:00
2011-12-04 16:44:20 +01:00
2011-11-05 16:51:25 +01:00
2011-11-30 20:34:45 +01:00
2011-11-30 20:34:45 +01:00
2011-12-07 15:29:26 +01:00
2011-12-04 16:44:20 +01:00
2011-11-03 20:21:01 +01:00
2011-12-07 03:19:42 +01:00
2011-12-04 16:44:20 +01:00
2011-12-06 17:42:10 +01:00
2011-11-30 17:39:32 +02:00
2011-11-30 20:34:45 +01:00