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

devices: Disable v4l to fix compilation until someone

2012-01-28 08:44:33 +01:00

alsa-audio-common.c

Merge remote-tracking branch 'qatar/master'

2011-11-26 01:12:08 +01:00

alsa-audio-dec.c

alsa: fix timefilter usage.

2012-03-05 16:57:28 +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

alsa: fix timefilter usage.

2012-03-05 16:57:28 +01:00

avdevice.c

libavdevice: increase LIBAVDEVICE_VERSION_MICRO to 100

2011-12-22 03:06:33 +01:00

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-01-28 07:53:34 +01: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-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

libcdio: add a forgotten AVClass to the private context.

2012-03-04 21:01:41 +01:00

libdc1394.c

Merge remote-tracking branch 'qatar/master'

2012-01-28 07:53:34 +01:00

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

Merge remote-tracking branch 'qatar/master'

2012-01-28 07:53:34 +01:00

oss_audio.c

Merge remote-tracking branch 'qatar/master'

2012-01-28 07:53:34 +01:00

pulse.c

Merge remote-tracking branch 'qatar/master'

2012-01-28 07:53:34 +01:00

sdl.c

sdl: fix aspect ratio computations.

2012-06-10 09:57:50 +02:00

sndio_common.c

…

sndio_common.h

…

sndio_dec.c

Merge remote-tracking branch 'qatar/master'

2012-01-28 07:53:34 +01:00

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

v4l: fix compilation

2012-01-25 00:13:35 +01:00

vfwcap.c

Merge remote-tracking branch 'qatar/master'

2012-01-28 07:53:34 +01:00

x11grab.c

x11grab: use AV_OPT_TYPE_IMAGE_SIZE.

2012-05-20 18:24:20 +02:00