ffmpeg/libavdevice
Michael Niedermayer 976a8b2179 Merge remote-tracking branch 'qatar/master'
* qatar/master: (40 commits)
  H.264: template left MB handling
  H.264: faster fill_decode_caches
  H.264: faster write_back_*
  H.264: faster fill_filter_caches
  H.264: make filter_mb_fast support the case of unavailable top mb
  Do not include log.h in avutil.h
  Do not include pixfmt.h in avutil.h
  Do not include rational.h in avutil.h
  Do not include mathematics.h in avutil.h
  Do not include intfloat_readwrite.h in avutil.h
  Remove return statements following infinite loops without break
  RTSP: Doxygen comment cleanup
  doxygen: Escape '\' in Doxygen documentation.
  md5: cosmetics
  md5: use AV_WL32 to write result
  md5: add fate test
  md5: include correct headers
  md5: fix test program
  doxygen: Drop array size declarations from Doxygen parameter names.
  doxygen: Fix parameter names to match the function prototypes.
  ...

Conflicts:
	libavcodec/x86/dsputil_mmx.c
	libavformat/flvenc.c
	libavformat/oggenc.c
	libavformat/wtv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-04 00:45:21 +02:00
..
alldevices.c lavdev: add openal input device 2011-06-27 15:26:14 +02:00
alsa-audio-common.c ALSA demuxer: use av_gettime and a timefilter. 2011-07-02 10:43:38 +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 ALSA demuxer: use av_gettime and a timefilter. 2011-07-02 10:43:38 +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-06-24 03:07:04 +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 lavdev: improve feedback in case of invalid frame rate/size 2011-06-23 08:49:49 +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 oss,sndio: simplify by using FFMIN. 2011-06-09 22:53:17 +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 x11grab: remove a memory allocation and the associated memcpy. 2011-06-12 12:18:05 +02:00