ffmpeg/libavdevice
Michael Niedermayer 13b7781ec8 Merge remote-tracking branch 'qatar/master'
* qatar/master: (23 commits)
  x86inc: use sse versions of common macros instead of sse2 when applicable
  doc/APIchanges: add missing dates and hashes
  lavf: don't return from void av_update_cur_dts()
  Changelog: add more entries.
  Changelog: update ffmpeg/avconv incompatibility list.
  avconv: remove some redundant temporary variables.
  avconv: fix broken indentation
  avconv: move copy_initial_nonkeyframes to the options context.
  avconv: use file:stream instead of file.stream in log messages.
  doc/avconv: elaborate on basic functionality.
  doc/avconv: -sample_fmts, not -help sample_fmts prints the sample formats
  openssl: Only use CRYPTO_set_id_callback on OpenSSL < 1.0.0
  Call avformat_network_init/deinit in the programs
  Remove leftover includes of strings.h
  avutil: Don't allow using strcasecmp/strncasecmp
  Replace all usage of strcasecmp/strncasecmp
  avstring: Add locale independent implementations of strcasecmp/strncasecmp
  avstring: Add locale independent implementations of toupper/tolower
  cosmetics: insert some spaces in explicit enum value assignments
  move 8SVX audio codecs to the audio codec list part on the next bump
  ...

Conflicts:
	avprobe.c
	doc/APIchanges
	ffplay.c
	ffserver.c
	libavcodec/avcodec.h
	libavdevice/bktr.c
	libavdevice/v4l.c
	libavdevice/v4l2.c
	libavformat/matroskaenc.c
	libavformat/wtv.c
	libavutil/avstring.c
	libavutil/avstring.h
	libavutil/avutil.h
	libswscale/x86/swscale_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-07 03:01:43 +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-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_common.c
dshow_enummediatypes.c
dshow_enumpins.c
dshow_filter.c
dshow_pin.c
dshow.c dshow: support BI_BITFIELDS compression type 2011-11-06 16:53:49 +01:00
dshow.h
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
Makefile pulse: introduce pulseaudio input 2011-10-26 16:39:33 -07: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-10-28 03:05:16 +02: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
v4l2.c Replace all usage of strcasecmp/strncasecmp 2011-11-06 11:52:57 +02:00
v4l.c Merge remote-tracking branch 'qatar/master' 2011-11-07 03:01:43 +01:00
vfwcap.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
x11grab.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00