Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Oct 2011 00:53:33 +0000 (02:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Oct 2011 01:05:16 +0000 (03:05 +0200)
commit8d4e44993a87a9b230c5c87cf892dd58adcebcc4
treed21f2d4bbcbe37b7876356b60b11f3f8eddb33f5
parentaa638b4600e1fa7a1b64323b8228c459af644a47
parent15946eb8a940416d9792c65900273d674f9c152a
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavc: remove "legacy" mpegvideo decoder.
  iv8: assemble packets to return complete frames
  pulse: documentation
  pulse: introduce pulseaudio input
  remove the zork pcm seek test

Conflicts:
configure
libavdevice/Makefile
libavdevice/alldevices.c
libavdevice/avdevice.h
libavdevice/pulse.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/indevs.texi
libavdevice/pulse.c
libavformat/iv8.c