ffmpeg/tests/ref
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
..
acodec Merge remote-tracking branch 'qatar/master' 2011-09-17 22:36:43 +02:00
fate lavf/utils: rewrite real fps calculation code. 2011-09-16 21:29:58 +02:00
lavf Merge remote-tracking branch 'qatar/master' 2011-09-17 22:36:43 +02:00
lavfi sws: use shift for chroma sample up convertion 2011-08-25 14:49:29 +02:00
seek ffmdec: fix seeking for non indexed files 2011-09-08 20:53:37 +02:00
vsynth1 Merge remote-tracking branch 'qatar/master' 2011-08-13 22:24:47 +02:00
vsynth2 Merge remote-tracking branch 'qatar/master' 2011-08-13 22:24:47 +02:00