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	Replace FFmpeg with Libav in licence headers	2011-03-19 13:33:20 +00:00
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: add audio/video options	2011-09-16 11:06:56 +02:00
dshow_enummediatypes.c	DirectShow capture support	2011-05-21 17:23:14 +02:00
dshow_enumpins.c	dshow: cleanup internal references on capture interface	2011-09-16 11:16:05 +02:00
dshow_filter.c	dshow: cleanup internal references on capture interface	2011-09-16 11:16:05 +02:00
dshow_pin.c	dshow: release pin on disconnect	2011-09-16 11:16:05 +02:00
dshow.c	lavf: rename remaining av_set_pts_info() to avpriv_set_pts_info().	2011-12-03 03:24:32 +01:00
dshow.h	dshow: add audio/video options	2011-09-16 11:06:56 +02:00
dv1394.c	Merge remote-tracking branch 'qatar/master'	2011-11-07 03:01:43 +01:00
dv1394.h	Replace FFmpeg with Libav in licence headers	2011-03-19 13:33:20 +00:00
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	lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.h	2011-05-27 12:15:09 +02:00
sndio_common.h	lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.h	2011-05-27 12:15:09 +02:00
sndio_dec.c	Merge remote-tracking branch 'qatar/master'	2011-12-01 02:54:24 +01:00
sndio_enc.c	oss,sndio: simplify by using FFMIN.	2011-06-09 22:53:17 +02:00
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