ffmpeg/libavdevice
Michael Niedermayer 46eb300d01 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  ARM: remove MULL inline asm
  mathops: use MUL64 macro where it forms part of other ops
  tty: factorise returning error codes.
  rawdec: add framerate private option.
  x11grab: add framerate private option.
  fbdev,v4l2: remove some forgotten uses of AVFormatParameters.time_base.
  bktr: don't error when AVFormatParameters.time_base isn't set.
  cmdutils: add missing const qualifier
  Skip headers not designed to work standalone during 'make checkheaders'.
  Add missing #includes to make headers self-contained.
  musepack: remove unnecessary #include from mpcdata.h
  musepack: remove extraneous mpcdata.h inclusions
  Fix error check in av_file_map()

Conflicts:
	cmdutils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-05 03:00:31 +02:00
..
Makefile lavdev: add SDL output device 2011-05-28 19:17:14 +02:00
alldevices.c lavdev: add SDL output device 2011-05-28 19:17:14 +02:00
alsa-audio-common.c lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.h 2011-05-27 12:15:09 +02:00
alsa-audio-dec.c lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.h 2011-05-27 12:15:09 +02:00
alsa-audio-enc.c lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.h 2011-05-27 12:15:09 +02:00
alsa-audio.h lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.h 2011-05-27 12:15:09 +02:00
avdevice.c
avdevice.h lavdev: add SDL output device 2011-05-28 19:17:14 +02:00
bktr.c Merge remote-tracking branch 'qatar/master' 2011-06-05 03:00:31 +02:00
dshow.c lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.h 2011-05-27 12:15:09 +02:00
dshow.h lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.h 2011-05-27 12:15:09 +02:00
dshow_common.c DirectShow capture support 2011-05-21 17:23:14 +02:00
dshow_enummediatypes.c DirectShow capture support 2011-05-21 17:23:14 +02:00
dshow_enumpins.c DirectShow capture support 2011-05-21 17:23:14 +02:00
dshow_filter.c DirectShow capture support 2011-05-21 17:23:14 +02:00
dshow_pin.c DirectShow capture support 2011-05-21 17:23:14 +02:00
dv1394.c Merge remote-tracking branch 'qatar/master' 2011-06-03 05:19:30 +02:00
dv1394.h
fbdev.c Merge remote-tracking branch 'qatar/master' 2011-06-05 03:00:31 +02:00
jack_audio.c lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.h 2011-05-27 12:15:09 +02:00
libavdevice.v
libdc1394.c Merge remote-tracking branch 'qatar/master' 2011-06-05 03:00:31 +02:00
oss_audio.c lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.h 2011-05-27 12:15:09 +02:00
sdl.c lavdev: add SDL output device 2011-05-28 19:17:14 +02: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-05-26 03:28:22 +02:00
sndio_enc.c lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.h 2011-05-27 12:15:09 +02:00
v4l.c lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.h 2011-05-27 12:15:09 +02:00
v4l2.c Merge remote-tracking branch 'qatar/master' 2011-06-05 03:00:31 +02:00
vfwcap.c Merge remote-tracking branch 'qatar/master' 2011-06-03 05:19:30 +02:00
x11grab.c Merge remote-tracking branch 'qatar/master' 2011-06-05 03:00:31 +02:00