diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-28 02:53:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-28 03:05:16 +0200 |
| commit | 8d4e44993a87a9b230c5c87cf892dd58adcebcc4 (patch) | |
| tree | d21f2d4bbcbe37b7876356b60b11f3f8eddb33f5 /libavfilter/vsrc_mptestsrc.c | |
| parent | aa638b4600e1fa7a1b64323b8228c459af644a47 (diff) | |
| parent | 15946eb8a940416d9792c65900273d674f9c152a (diff) | |
| download | ffmpeg-8d4e44993a87a9b230c5c87cf892dd58adcebcc4.tar.gz | |
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>
Diffstat (limited to 'libavfilter/vsrc_mptestsrc.c')
0 files changed, 0 insertions, 0 deletions