Michael Niedermayer 70d9fb6963 Merge remote-tracking branch 'qatar/master' ... * qatar/master: sunrast: Check for out of bounds reads lavc: rename AV_ER_* options to AV_EF_* and rename AGGRESSIVE to BUFFER lavc: replace API-bump-triggered AVCodecContext field change with shorter, non-conflicting name Add libvpx presets. doc/avtools: add forgotten part to stream specifiers description swscale: prevent overflow during initialization g722: Add a fate test for the encoder fate: Add a target for creating a 16000 Hz mono synthetic audio file macosx: use the default surface on newer sdl Conflicts: ffplay.c libavcodec/avcodec.h Merged-by: Michael Niedermayer <michaelni@gmx.at>		2011-10-19 02:08:59 +02:00
..
libvpx-360p.avpreset	Add libvpx presets.	2011-10-18 11:40:19 +02:00
libvpx-360p.ffpreset	presets: forgotten libvpx presets	2011-06-21 17:52:16 +02:00
libvpx-720p50_60.avpreset	Add libvpx presets.	2011-10-18 11:40:19 +02:00
libvpx-720p50_60.ffpreset	presets: forgotten libvpx presets	2011-06-21 17:52:16 +02:00
libvpx-720p.avpreset	Add libvpx presets.	2011-10-18 11:40:19 +02:00
libvpx-720p.ffpreset	presets: forgotten libvpx presets	2011-06-21 17:52:16 +02:00
libvpx-1080p50_60.avpreset	Add libvpx presets.	2011-10-18 11:40:19 +02:00
libvpx-1080p50_60.ffpreset	presets: forgotten libvpx presets	2011-06-21 17:52:16 +02:00
libvpx-1080p.avpreset	Add libvpx presets.	2011-10-18 11:40:19 +02:00
libvpx-1080p.ffpreset	presets: forgotten libvpx presets	2011-06-21 17:52:16 +02:00
libx264-ipod320.ffpreset	presets: use private options in libx264-ipod ffpresets	2011-09-22 06:27:07 +02:00
libx264-ipod640.ffpreset	presets: use private options in libx264-ipod ffpresets	2011-09-22 06:27:07 +02:00