1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
FFmpeg/libavdevice
Michael Niedermayer 042f9d62ca Merge remote-tracking branch 'qatar/master'
* qatar/master:
  configure: Automatically add more flags required on symbian
  mem.h: switch doxygen parameter order to match function prototype
  doxygen: replace @sa tag by the more readable but equivalent @see
  doxygen: use Doxygen markup for authors and web links where appropriate
  doxygen: do not include license boilerplate in Doxygen documentation
  ac3enc: Mark AVClasses const
  ffserver: Replace two loops with one loop.
  ffmpeg: Fix the check for experimental codecs
  swscale: extend mmx padding.
  swscale: clip unscaled colorspace conversion path.
  doxygen: misc consistency cosmetics
  doc: remove file name from @file directive in Doxygen usage example
  doxygen: consistently place brief description
  doxygen: place empty line between brief description and detailed description
  avformat_open_input(): Add braces to shut up gcc warning.

Conflicts:
	libavcodec/8svx.c
	libavcodec/tiff.c
	libavcodec/tiff.h
	libavcodec/vaapi_h264.c
	libavcodec/vorbis.c
	libavcodec/vorbisdec.c
	libavcodec/vp6.c
	libswscale/swscale_unscaled.c
	libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-15 17:51:09 +02:00
..
alldevices.c lavdev: add openal input device 2011-06-27 15:26:14 +02:00
alsa-audio-common.c Merge remote-tracking branch 'qatar/master' 2011-07-10 04:28:50 +02:00
alsa-audio-dec.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
alsa-audio-enc.c ALSA: implement get_output_timestamp. 2011-07-01 09:49:32 +02:00
alsa-audio.h Merge remote-tracking branch 'qatar/master' 2011-07-10 04:28:50 +02:00
avdevice.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
avdevice.h lavdev: add openal input device 2011-06-27 15:26:14 +02:00
bktr.c Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +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
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
dv1394.c Merge remote-tracking branch 'qatar/master' 2011-06-03 05:19:30 +02: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-07-15 17:51:09 +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 Add symbol versioning for shared libraries 2010-01-16 04:49:02 +00:00
libdc1394.c Merge remote-tracking branch 'qatar/master' 2011-07-06 01:34:08 +02:00
Makefile Merge remote-tracking branch 'qatar/master' 2011-06-29 05:23:12 +02:00
openal-dec.c openal: prefer ISC license 2011-07-01 10:51:46 +02:00
oss_audio.c Merge remote-tracking branch 'qatar/master' 2011-07-09 02:06:40 +02:00
sdl.c sdl: align option fields after last commit 2011-06-05 13:55:02 +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 oss,sndio: simplify by using FFMIN. 2011-06-09 22:53:17 +02:00
v4l2.c Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +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
vfwcap.c Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
x11grab.c Merge remote-tracking branch 'qatar/master' 2011-07-09 02:06:40 +02:00