Michael Niedermayer c065255bba Merge remote-tracking branch 'qatar/master' ... * qatar/master: aacenc: Fix LONG_START windowing. aacenc: Fix a bug where deinterleaved samples were stored in the wrong place. avplay: use the correct array size for stride. lavc: extend doxy for avcodec_alloc_context3(). APIchanges: mention avcodec_alloc_context()/2/3 avcodec_align_dimensions2: set only 4 linesizes, not AV_NUM_DATA_POINTERS. aacsbr: ARM NEON optimised sbrdsp functions aacsbr: align some arrays aacsbr: move some simdable loops to function pointers cosmetics: Remove extra newlines at EOF Conflicts: libavcodec/utils.c libavfilter/formats.c libavutil/mem.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-01-29 00:34:59 +01: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	Merge remote-tracking branch 'qatar/master'	2012-01-28 07:53:34 +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	Merge remote-tracking branch 'qatar/master'	2011-10-22 01:16:41 +02:00
avdevice.c	libavdevice: increase LIBAVDEVICE_VERSION_MICRO to 100	2011-12-22 03:06:33 +01:00
avdevice.h	Merge remote-tracking branch 'qatar/master'	2012-01-29 00:34:59 +01:00
bktr.c	Merge remote-tracking branch 'qatar/master'	2012-01-28 07:53:34 +01:00
dshow_common.c	dshow: add audio/video options	2011-09-16 11:06:56 +02:00
dshow_enummediatypes.c
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	Merge remote-tracking branch 'qatar/master'	2012-01-28 07:53:34 +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'	2012-01-28 07:53:34 +01:00
dv1394.h	cleanup: for(int	2011-12-13 21:08:43 +01:00
fbdev.c	Merge remote-tracking branch 'qatar/master'	2012-01-28 07:53:34 +01:00
jack_audio.c	Merge remote-tracking branch 'qatar/master'	2012-01-28 07:53:34 +01:00
lavfi.c	Merge remote-tracking branch 'qatar/master'	2012-01-28 07:53:34 +01:00
libavdevice.v
libcdio.c	Merge remote-tracking branch 'qatar/master'	2012-01-28 07:53:34 +01:00
libdc1394.c	Merge remote-tracking branch 'qatar/master'	2012-01-28 07:53:34 +01:00
Makefile	buildsystem: 10l add v4l entry back	2012-01-25 00:46:41 +01: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	Make sdl_overlay_pix_fmt_map static const.	2011-11-05 15:37:02 +01: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	Merge remote-tracking branch 'qatar/master'	2012-01-08 03:34:22 +01:00
timefilter.h	Merge remote-tracking branch 'qatar/master'	2011-12-12 01:25:37 +01:00
v4l2.c	Merge remote-tracking branch 'qatar/master'	2012-01-28 07:53:34 +01: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	Merge remote-tracking branch 'qatar/master'	2012-01-28 07:53:34 +01:00