[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'
Michael Niedermayer
git at videolan.org
Fri Oct 28 03:12:09 CEST 2011
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct 28 02:53:33 2011 +0200| [8d4e44993a87a9b230c5c87cf892dd58adcebcc4] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8d4e44993a87a9b230c5c87cf892dd58adcebcc4
---
More information about the ffmpeg-cvslog
mailing list