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

..

acodec

Merge remote-tracking branch 'qatar/master'

2011-10-14 22:24:00 +02:00

fate

Merge remote-tracking branch 'qatar/master'

2011-10-19 02:08:59 +02:00

lavf

Merge remote-tracking branch 'qatar/master'

2011-10-14 22:24:00 +02:00

lavfi

swscale: prevent overflow during initialization

2011-10-18 10:29:49 +02:00

seek

Merge remote-tracking branch 'qatar/master'

2011-10-14 22:24:00 +02:00

vsynth1

regression tests: add jpeg2000

2011-09-27 21:32:39 +02:00

vsynth2

regression tests: add jpeg2000

2011-09-27 21:32:39 +02:00