Michael Niedermayer 9a9ceb8776 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  lavfi: add select filter
  oggdec: fix out of bound write in the ogg demuxer
  movenc: create an alternate group for each media type
  lavd: add libcdio-paranoia input device for audio CD grabbing
  rawdec: refactor private option for raw video demuxers
  pcmdec: use unique classes for all pcm demuxers.
  rawdec: g722 is always 1 channel/16kHz

Conflicts:
	Changelog
	configure
	doc/filters.texi
	libavdevice/avdevice.h
	libavfilter/avfilter.h
	libavfilter/vf_select.c
	tests/ref/lavf/mov

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-17 22:36:43 +02:00
..
2011-08-09 19:56:21 +02:00
2011-06-07 00:37:00 +02:00
2011-09-13 23:52:43 +02:00
2011-08-09 19:56:25 +02:00
2011-09-16 05:53:14 +02:00
2011-04-10 04:31:54 +02:00
2011-09-16 21:22:05 +02:00
2011-08-09 19:56:21 +02:00
2011-01-30 03:41:47 +01:00