mirrors/librempeg
1
0
Fork 0
mirror of https://github.com/librempeg/librempeg synced 2024-11-23 11:39:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
de05877390
librempeg/libavdevice
History
Michael Niedermayer 4da42ebe44 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  MS Screen 1 decoder
  aacdec: Fix popping channel layouts.
  av_gettime: support Win32 without gettimeofday()
  Use av_gettime() in various places
  Move av_gettime() to libavutil
  dct-test: use emms_c() from libavutil instead of duplicating it
  mov: fix operator precedence bug
  mathematics.h: remove a couple of math defines
  Remove unnecessary inclusions of [sys/]time.h
  lavf: remove unnecessary inclusions of unistd.h
  bfin: libswscale: add const where appropriate to fix warnings
  bfin: libswscale: remove unnecessary #includes
  udp: Properly check for invalid sockets
  tcp: Check the return value from getsockopt
  network: Use av_strerror for getting error messages
  udp: Properly print error from getnameinfo
  mmst: Use AVUNERROR() to convert error codes to the right range for strerror
  network: Pass pointers of the right type to get/setsockopt/ioctlsocket on windows
  rtmp: Reduce the number of idle posts sent by sleeping 50ms

Conflicts:
	Changelog
	configure
	libavcodec/aacdec.c
	libavcodec/allcodecs.c
	libavcodec/avcodec.h
	libavcodec/dct-test.c
	libavcodec/version.h
	libavformat/riff.c
	libavformat/udp.c
	libavutil/Makefile
	libswscale/bfin/yuv2rgb_bfin.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-20 20:47:46 +02:00
..
alldevices.c
alsa-audio-common.c
alsa-audio-dec.c alsa: fix timefilter usage. 2012-03-05 16:57:28 +01:00
alsa-audio-enc.c
alsa-audio.h alsa: fix timefilter usage. 2012-03-05 16:57:28 +01:00
avdevice.c
avdevice.h avdevice: bump soname due to lavf soname bump 2012-05-25 12:22:21 +02:00
bktr.c bktr: use AV_OPT_TYPE_IMAGE_SIZE. 2012-05-20 18:24:20 +02:00
dshow_capture.h dshow: rename dshow.h to avoid conflict with system header of equal name 2012-05-24 14:15:10 +02:00
dshow_common.c dshow: rename dshow.h to avoid conflict with system header of equal name 2012-05-24 14:15:10 +02:00
dshow_enummediatypes.c dshow: rename dshow.h to avoid conflict with system header of equal name 2012-05-24 14:15:10 +02:00
dshow_enumpins.c dshow: rename dshow.h to avoid conflict with system header of equal name 2012-05-24 14:15:10 +02:00
dshow_filter.c dshow: rename dshow.h to avoid conflict with system header of equal name 2012-05-24 14:15:10 +02:00
dshow_pin.c dshow: rename dshow.h to avoid conflict with system header of equal name 2012-05-24 14:15:10 +02:00
dshow.c dshow: rename dshow.h to avoid conflict with system header of equal name 2012-05-24 14:15:10 +02:00
dv1394.c Merge remote-tracking branch 'qatar/master' 2012-06-20 20:47:46 +02:00
dv1394.h Merge remote-tracking branch 'qatar/master' 2012-06-15 00:14:21 +02:00
fbdev.c Merge remote-tracking branch 'qatar/master' 2012-06-20 20:47:46 +02:00
jack_audio.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
lavfi.c lavfi: drop planar/packed negotiation support 2012-05-16 13:16:05 +02:00
libavdevice.v
libcdio.c libcdio: add a forgotten AVClass to the private context. 2012-03-04 21:01:41 +01:00
libdc1394.c
Makefile dshow: rename dshow.h to avoid conflict with system header of equal name 2012-05-24 14:15:10 +02:00
openal-dec.c
oss_audio.c Merge remote-tracking branch 'qatar/master' 2012-06-20 20:47:46 +02:00
pulse.c
sdl.c sdl: fix aspect ratio computations. 2012-06-10 09:57:50 +02:00
sndio_common.c
sndio_common.h
sndio_dec.c
sndio_enc.c
timefilter.c timefilter: allow to evaluate at other times. 2012-04-04 14:32:44 +02:00
timefilter.h timefilter: allow to evaluate at other times. 2012-04-04 14:32:44 +02:00
v4l2.c Merge remote-tracking branch 'qatar/master' 2012-06-20 20:47:46 +02:00
v4l.c
vfwcap.c
x11grab.c x11grab: use AV_OPT_TYPE_IMAGE_SIZE. 2012-05-20 18:24:20 +02:00