Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 17 Sep 2011 20:25:13 +0000 (22:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 17 Sep 2011 20:36:43 +0000 (22:36 +0200)
commit9a9ceb8776264c799ff9669ed7e287a5daaab564
tree25748ff74acaa620aa627ed7797a87e986959f19
parent979bea13003ef489d95d2538ac2fb1c26c6f103b
parentd763fb7d47fdbd107ea65cdf511f2f21558f6610
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>
14 files changed:
Changelog
configure
doc/filters.texi
libavdevice/Makefile
libavdevice/alldevices.c
libavdevice/avdevice.h
libavfilter/vf_select.c
libavformat/ingenientdec.c
libavformat/movenc.c
libavformat/pcmdec.c
libavformat/rawdec.c
libavformat/rawdec.h
libavformat/rawvideodec.c
tests/ref/lavf/mov