Michael Niedermayer 3e1a7ae44a Merge remote-tracking branch 'qatar/master' ... * qatar/master: swfdec: Add support for sample_rate_code 0 (5512 Hz) dct-test: factor out some common code and do whas was likely intended doc: library versions need to be bumped in version.h Revert "ffmpeg: get rid of useless AVInputStream.nb_streams." Remove some forgotten AVCodecContext.palctrl usage. lavc/utils: move avcodec_init() higher in the file. lavc: replace some deprecated FF_*_TYPE with AV_PICTURE_TYPE_* ac3dec: actually use drc_scale private option lavc: undeprecate AVPALETTE_SIZE and AVPALETTE_COUNT macros alsa: add missing header msmpeg4: remove leftover unused debug variable declaration Fix assert() calls that need updates after FF_COMMON_FRAME macro elimination. Fix av_dlog invocations with wrong or missing logging context. vf_yadif: add support to yuva420p vf_yadif: correct documentation on the parity parameter vf_yadif: copy buffer properties like aspect for second frame as well oma: support for encrypted files id3v2: add support for non-text and GEOB type tag frames des: add possibility to calculate DES-CBC-MAC with small buffer Conflicts: ffmpeg.c libavcodec/dct-test.c libavformat/mpegts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2011-09-21 21:25:43 +02:00
..
alldevices.c
alsa-audio-common.c	Merge remote-tracking branch 'qatar/master'	2011-09-21 21:25:43 +02:00
alsa-audio-dec.c
alsa-audio-enc.c
alsa-audio.h
avdevice.c
avdevice.h
bktr.c
dshow_common.c
dshow_enummediatypes.c
dshow_enumpins.c
dshow_filter.c
dshow_pin.c
dshow.c
dshow.h
dv1394.c
dv1394.h
fbdev.c
jack_audio.c
lavfi.c
libavdevice.v
libcdio.c
libdc1394.c
Makefile
openal-dec.c
oss_audio.c
sdl.c
sndio_common.c
sndio_common.h
sndio_dec.c
sndio_enc.c
v4l2.c
v4l.c
vfwcap.c
x11grab.c