ffmpeg/libavdevice
Michael Niedermayer a72580fc9e Merge remote-tracking branch 'qatar/master'
* qatar/master:
  binkvideo: simplify and remove invalid shifts
  pulse: compute frame_duration once and fix it
  lavf: simplify format_child_class_next()
  hwaccel: OS X Video Decoder Acceleration (VDA) support.
  doc: add support for an optional navigation bar in texi2html pages

Conflicts:
	configure
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/vda.c
	libavcodec/vda.h
	libavcodec/vda_h264.c
	libavcodec/vda_internal.h
	libavcodec/version.h
	libavformat/options.c
	libavutil/avutil.h
	libavutil/pixfmt.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-15 03:13:42 +01:00
..
Makefile pulse: introduce pulseaudio input 2011-10-26 16:39:33 -07: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-09-21 21:25:43 +02:00
alsa-audio-dec.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
alsa-audio-enc.c Merge remote-tracking branch 'qatar/master' 2011-09-24 22:39:52 +02: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-11-07 03:01:43 +01:00
dshow.c dshow: support BI_BITFIELDS compression type 2011-11-06 16:53:49 +01:00
dshow.h
dshow_common.c
dshow_enummediatypes.c
dshow_enumpins.c
dshow_filter.c
dshow_pin.c
dv1394.c Merge remote-tracking branch 'qatar/master' 2011-11-07 03:01:43 +01:00
dv1394.h
fbdev.c Make rgb_pixfmt_map const. 2011-11-05 15:37:02 +01:00
jack_audio.c Merge remote-tracking branch 'qatar/master' 2011-10-22 01:16:41 +02:00
lavfi.c Replace remaining av_new_stream() with avformat_new_stream(). 2011-11-05 15:07:19 +01:00
libavdevice.v
libcdio.c Merge remote-tracking branch 'qatar/master' 2011-10-21 02:01:26 +02:00
libdc1394.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
openal-dec.c Replace remaining av_new_stream() with avformat_new_stream(). 2011-11-05 15:07:19 +01:00
oss_audio.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
pulse.c Merge remote-tracking branch 'qatar/master' 2011-11-15 03:13:42 +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-10-20 02:34:51 +02: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
v4l.c Merge remote-tracking branch 'qatar/master' 2011-11-07 03:01:43 +01:00
v4l2.c v4l2: fix uninitialized variable 2011-11-08 01:20:35 +01:00
vfwcap.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
x11grab.c Force opaque alpha channel for 32bit x11grab image. 2011-11-13 02:02:06 +01:00