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

..

alldevices.c

pulse: introduce pulseaudio input

2011-10-26 16:39:33 -07:00

alsa-audio-common.c

Merge remote-tracking branch 'qatar/master'

2011-11-26 01:12:08 +01:00

alsa-audio-dec.c

Merge remote-tracking branch 'qatar/master'

2011-12-01 02:54:24 +01:00

alsa-audio-enc.c

lavf: rename remaining av_set_pts_info() to avpriv_set_pts_info().

2011-12-03 03:24:32 +01:00

alsa-audio.h

Merge remote-tracking branch 'qatar/master'

2011-10-22 01:16:41 +02:00

avdevice.c

…

avdevice.h

pulse: introduce pulseaudio input

2011-10-26 16:39:33 -07:00

bktr.c

Merge remote-tracking branch 'qatar/master'

2011-12-01 02:54:24 +01:00

dshow_common.c

…

dshow_enummediatypes.c

…

dshow_enumpins.c

…

dshow_filter.c

…

dshow_pin.c

…

dshow.c

lavf: rename remaining av_set_pts_info() to avpriv_set_pts_info().

2011-12-03 03:24:32 +01:00

dshow.h

…

dv1394.c

Merge remote-tracking branch 'qatar/master'

2011-11-07 03:01:43 +01:00

dv1394.h

…

fbdev.c

Merge remote-tracking branch 'qatar/master'

2011-12-01 02:54:24 +01:00

jack_audio.c

Merge remote-tracking branch 'qatar/master'

2011-12-01 02:54:24 +01:00

lavfi.c

lavf: rename remaining av_set_pts_info() to avpriv_set_pts_info().

2011-12-03 03:24:32 +01:00

libavdevice.v

…

libcdio.c

Merge remote-tracking branch 'qatar/master'

2011-12-01 02:54:24 +01:00

libdc1394.c

Merge remote-tracking branch 'qatar/master'

2011-12-08 00:23:37 +01:00

Makefile

pulse: introduce pulseaudio input

2011-10-26 16:39:33 -07:00

openal-dec.c

lavf: rename remaining av_set_pts_info() to avpriv_set_pts_info().

2011-12-03 03:24:32 +01:00

oss_audio.c

Merge remote-tracking branch 'qatar/master'

2011-12-01 02:54:24 +01:00

pulse.c

Merge remote-tracking branch 'qatar/master'

2011-12-06 01:37:27 +01:00

sdl.c

Make sdl_overlay_pix_fmt_map static const.

2011-11-05 15:37:02 +01:00

sndio_common.c

…

sndio_common.h

…

sndio_dec.c

Merge remote-tracking branch 'qatar/master'

2011-12-01 02:54:24 +01:00

sndio_enc.c

…

timefilter.c

Merge remote-tracking branch 'qatar/master'

2011-10-22 01:16:41 +02:00

timefilter.h

Merge remote-tracking branch 'qatar/master'

2011-10-22 01:16:41 +02:00

v4l2.c

Merge remote-tracking branch 'qatar/master'

2011-12-01 02:54:24 +01:00

v4l.c

Merge remote-tracking branch 'qatar/master'

2011-12-01 02:54:24 +01:00

vfwcap.c

Merge remote-tracking branch 'qatar/master'

2011-12-01 02:54:24 +01:00

x11grab.c

Merge remote-tracking branch 'qatar/master'

2011-12-06 01:37:27 +01:00