1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
FFmpeg/libavdevice
Michael Niedermayer 15f8941108 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  Avoid C99 variable declarations within for statements.
  rtmp: Read and handle incoming packets while writing data
  doc: document THREAD_TYPE fate variable
  rtpdec: Don't require frames to start with a Mode A packet
  avconv: don't try to free threads that were not initialized.

Conflicts:
	doc/fate.texi
	ffplay.c
	libavdevice/dv1394.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-15 00:14:21 +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
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-04-04 21:17:52 +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
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
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 v4l2: use AV_OPT_TYPE_IMAGE_SIZE. 2012-05-20 18:24:20 +02:00
v4l.c
vfwcap.c
x11grab.c x11grab: use AV_OPT_TYPE_IMAGE_SIZE. 2012-05-20 18:24:20 +02:00