librempeg/libavdevice
Michael Niedermayer 7fad19a63d Merge remote-tracking branch 'qatar/master'
* qatar/master:
  x86: cabac: replace explicit memory references with "m" operands
  avplay: don't request a stereo downmix
  wmapro: use av_float2int()
  lavc: avoid invalid memcpy() in avcodec_default_release_buffer()
  lavu: replace int/float punning functions
  lavfi: install libavfilter/vsrc_buffer.h
  Remove extraneous semicolons
  sdp: Restore the original mp4 format h264 extradata if converted
  rtpenc: Add support for mp4 format h264
  rtpenc: Simplify code by introducing a separate end pointer
  movenc: Use the actual converted sample for RTP hinting
  Fix a bunch of common typos.

Conflicts:
	doc/developer.texi
	doc/eval.texi
	doc/filters.texi
	doc/protocols.texi
	ffmpeg.c
	ffplay.c
	libavcodec/mpegvideo.h
	libavcodec/x86/cabac.h
	libavfilter/Makefile
	libavformat/avformat.h
	libavformat/cafdec.c
	libavformat/flvdec.c
	libavformat/flvenc.c
	libavformat/gxfenc.c
	libavformat/img2.c
	libavformat/movenc.c
	libavformat/mpegts.c
	libavformat/rtpenc_h264.c
	libavformat/utils.c
	libavformat/wtv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-12 01:25:37 +01:00
..
alldevices.c
alsa-audio-common.c Merge remote-tracking branch 'qatar/master' 2011-11-26 01:12:08 +01:00
alsa-audio-dec.c Merge remote-tracking branch 'qatar/master' 2011-12-01 02:54:24 +01:00
alsa-audio-enc.c lavf: rename remaining av_set_pts_info() to avpriv_set_pts_info(). 2011-12-03 03:24:32 +01:00
alsa-audio.h
avdevice.c
avdevice.h
bktr.c Merge remote-tracking branch 'qatar/master' 2011-12-01 02:54:24 +01:00
dshow_common.c
dshow_enummediatypes.c
dshow_enumpins.c
dshow_filter.c
dshow_pin.c
dshow.c lavf: rename remaining av_set_pts_info() to avpriv_set_pts_info(). 2011-12-03 03:24:32 +01:00
dshow.h
dv1394.c Merge remote-tracking branch 'qatar/master' 2011-11-07 03:01:43 +01:00
dv1394.h
fbdev.c Merge remote-tracking branch 'qatar/master' 2011-12-01 02:54:24 +01:00
jack_audio.c Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
lavfi.c lavf: rename remaining av_set_pts_info() to avpriv_set_pts_info(). 2011-12-03 03:24:32 +01:00
libavdevice.v
libcdio.c Merge remote-tracking branch 'qatar/master' 2011-12-01 02:54:24 +01:00
libdc1394.c Merge remote-tracking branch 'qatar/master' 2011-12-08 00:23:37 +01:00
Makefile
openal-dec.c lavf: rename remaining av_set_pts_info() to avpriv_set_pts_info(). 2011-12-03 03:24:32 +01:00
oss_audio.c Merge remote-tracking branch 'qatar/master' 2011-12-01 02:54:24 +01:00
pulse.c Merge remote-tracking branch 'qatar/master' 2011-12-06 01:37:27 +01:00
sdl.c
sndio_common.c
sndio_common.h
sndio_dec.c Merge remote-tracking branch 'qatar/master' 2011-12-01 02:54:24 +01:00
sndio_enc.c
timefilter.c
timefilter.h Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
v4l2.c Merge remote-tracking branch 'qatar/master' 2011-12-01 02:54:24 +01:00
v4l.c Merge remote-tracking branch 'qatar/master' 2011-12-01 02:54:24 +01:00
vfwcap.c Merge remote-tracking branch 'qatar/master' 2011-12-01 02:54:24 +01:00
x11grab.c Merge remote-tracking branch 'qatar/master' 2011-12-06 01:37:27 +01:00