Michael Niedermayer 3ba0bfe71f Merge remote-tracking branch 'qatar/master' ... * qatar/master: ulti: Fix invalid reads lavf: dealloc private options in av_write_trailer yadif: support 10bit YUV vc1: mark with ER_MB_ERROR bits overconsumption lavc: introduce ER_MB_END and ER_MB_ERROR error_resilience: use the ER_ namespace build: move inclusion of subdir.mak to main subdir loop rv34: NEON optimised 4x4 dequant rv34: move 4x4 dequant to RV34DSPContext aacdec: Use intfloat.h rather than local punning union. Conflicts: libavcodec/h264.c libavcodec/vc1dec.c libavfilter/vf_yadif.c libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>		2011-12-13 23:21:37 +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-12-01 02:54:24 +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
avdevice.h	Merge remote-tracking branch 'qatar/master'	2011-12-13 00:39:48 +01:00
bktr.c	Merge remote-tracking branch 'qatar/master'	2011-12-01 02:54:24 +01:00
dshow_common.c
dshow_enummediatypes.c
dshow_enumpins.c
dshow_filter.c
dshow_pin.c
dshow.c	lavf: rename remaining av_set_pts_info() to avpriv_set_pts_info().	2011-12-03 03:24:32 +01:00
dshow.h
dv1394.c	Merge remote-tracking branch 'qatar/master'	2011-11-07 03:01:43 +01:00
dv1394.h	cleanup: for(int	2011-12-13 21:08:43 +01:00
fbdev.c	Merge remote-tracking branch 'qatar/master'	2011-12-01 02:54:24 +01:00
jack_audio.c	Merge remote-tracking branch 'qatar/master'	2011-12-12 01:25:37 +01:00
lavfi.c	lavf: rename remaining av_set_pts_info() to avpriv_set_pts_info().	2011-12-03 03:24:32 +01:00
libavdevice.v
libcdio.c	Merge remote-tracking branch 'qatar/master'	2011-12-01 02:54:24 +01:00
libdc1394.c	Merge remote-tracking branch 'qatar/master'	2011-12-08 00:23:37 +01:00
Makefile	Merge remote-tracking branch 'qatar/master'	2011-12-13 23:21:37 +01:00
openal-dec.c	lavf: rename remaining av_set_pts_info() to avpriv_set_pts_info().	2011-12-03 03:24:32 +01:00
oss_audio.c	Merge remote-tracking branch 'qatar/master'	2011-12-01 02:54:24 +01:00
pulse.c	Merge remote-tracking branch 'qatar/master'	2011-12-06 01:37:27 +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'	2011-12-01 02:54:24 +01:00
sndio_enc.c
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-12-12 01:25:37 +01:00
v4l2.c	Merge remote-tracking branch 'qatar/master'	2011-12-01 02:54:24 +01:00
v4l.c	Merge remote-tracking branch 'qatar/master'	2011-12-01 02:54:24 +01:00
vfwcap.c	Merge remote-tracking branch 'qatar/master'	2011-12-01 02:54:24 +01:00
x11grab.c	Merge remote-tracking branch 'qatar/master'	2011-12-06 01:37:27 +01:00