Michael Niedermayer 022f8d27dd Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  swscale: Readd #define _SVID_SOURCE
  Fix av_get_channel_layout_string() for positions >31
  configure: Store vda lib flags in extralibs instead of ldflags
  Make channel layout masks unsigned
  dca: ARMv6 optimised decode_blockcode()
  nullenc: drop AVFMT_RAWPICTURE from the flags
  frame-mt: return consumed packet size in ff_thread_decode_frame
  aacdec: add more fate tests covering SBR and PS
  MK(BE)TAG: avoid undefined shifts

Conflicts:
	configure
	libavcodec/arm/dca.h
	libavcodec/dca.c
	libavcodec/mlp_parser.c
	libavcodec/version.h
	libavfilter/asrc_anullsrc.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/defaults.c
	libavutil/audioconvert.c
	libavutil/avutil.h
	libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2011-11-26 01:12:08 +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-11-26 01:12:08 +01: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

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

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: add audio/video options

2011-09-16 11:06:56 +02:00

dshow_enummediatypes.c

DirectShow capture support

2011-05-21 17:23:14 +02:00

dshow_enumpins.c

dshow: cleanup internal references on capture interface

2011-09-16 11:16:05 +02:00

dshow_filter.c

dshow: cleanup internal references on capture interface

2011-09-16 11:16:05 +02:00

dshow_pin.c

dshow: release pin on disconnect

2011-09-16 11:16:05 +02:00

dshow.c

dshow: support BI_BITFIELDS compression type

2011-11-06 16:53:49 +01:00

dshow.h

dshow: add audio/video options

2011-09-16 11:06:56 +02:00

dv1394.c

Merge remote-tracking branch 'qatar/master'

2011-11-07 03:01:43 +01:00

dv1394.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

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

Add symbol versioning for shared libraries

2010-01-16 04:49:02 +00:00

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-11-15 03:13:42 +01:00

sdl.c

Make sdl_overlay_pix_fmt_map static const.

2011-11-05 15:37:02 +01:00

sndio_common.c

lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.h

2011-05-27 12:15:09 +02:00

sndio_common.h

lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.h

2011-05-27 12:15:09 +02:00

sndio_dec.c

Merge remote-tracking branch 'qatar/master'

2011-10-20 02:34:51 +02:00

sndio_enc.c

oss,sndio: simplify by using FFMIN.

2011-06-09 22:53:17 +02:00

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

Fix various if parenthesis misplacements.

2011-11-21 19:35:33 +01: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

Force opaque alpha channel for 32bit x11grab image.

2011-11-13 02:02:06 +01:00