Michael Niedermayer 43c157f4a4 Merge remote-tracking branch 'qatar/master' ... * qatar/master: af_resample: avoid conversion of identical sample formats for 1 channel avcodec: allow either planar or interleaved sample format when encoding mono adpcmenc: ensure calls to adpcm_ima_compress_sample() are in the right order timefilter: De-doxygenize normal code comments and drop silly ones gxf: Include the right header for the avpriv_frame_rate_tab declaration Conflicts: libavcodec/adpcmenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-10-08 13:11:11 +02:00
..
alldevices.c
alsa-audio-common.c
alsa-audio-dec.c	Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'	2012-09-05 14:33:32 +02:00
alsa-audio-enc.c
alsa-audio.h	Merge remote-tracking branch 'qatar/master'	2012-10-06 13:45:08 +02:00
avdevice.c
avdevice.h
bktr.c	Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'	2012-09-05 14:33:32 +02:00
caca.c	Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'	2012-09-05 14:33:32 +02:00
dshow_capture.h	dshow: Change WINBOOL to BOOL	2012-09-07 22:23:32 +02:00
dshow_common.c
dshow_enummediatypes.c
dshow_enumpins.c
dshow_filter.c
dshow_pin.c	dshow: Change WINBOOL to BOOL	2012-09-07 22:23:32 +02:00
dshow.c	dshow: enhance error message	2012-09-29 15:48:49 +02:00
dv1394.c	Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'	2012-09-05 14:33:32 +02:00
dv1394.h
fbdev.c
iec61883.c	Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'	2012-09-05 14:33:32 +02:00
jack_audio.c	Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'	2012-09-05 14:33:32 +02:00
lavfi.c	lavd/lavfi: push frames until the last sink is EOF	2012-09-20 12:13:17 +02:00
libavdevice.v
libcdio.c	Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'	2012-09-05 14:33:32 +02:00
libdc1394.c	Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'	2012-09-05 14:33:32 +02:00
Makefile
openal-dec.c	Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'	2012-09-05 14:33:32 +02:00
oss_audio.c	Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'	2012-09-05 14:33:32 +02:00
pulse.c	Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'	2012-09-05 14:33:32 +02:00
sdl.c	lavd/sdl: decrease debug info notice log level from AV_LOG_INFO to VERBOSE	2012-09-07 14:31:38 +02:00
sndio_common.c
sndio_common.h	Merge remote-tracking branch 'qatar/master'	2012-10-06 13:45:08 +02:00
sndio_dec.c	Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'	2012-09-05 14:33:32 +02:00
sndio_enc.c
timefilter.c	Merge remote-tracking branch 'qatar/master'	2012-10-08 13:11:11 +02:00
timefilter.h
v4l2.c	Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'	2012-09-05 14:33:32 +02:00
v4l.c	Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'	2012-09-05 14:33:32 +02:00
version.h	Add missing version macros to libraries	2012-09-28 15:10:18 +02:00
vfwcap.c
x11grab.c	Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'	2012-09-05 14:33:32 +02:00