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

..

fate

Merge remote-tracking branch 'qatar/master'

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

ref

Merge remote-tracking branch 'qatar/master'

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

audiogen.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

base64.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

codec-regression.sh

reg tests: add g723.1

2011-10-10 02:58:18 +02:00

copycooker.sh

build: remove unused copy regression test script

2011-07-07 22:47:24 +02:00

fate2.mak

g722: Add a fate test for the encoder

2011-10-18 10:45:22 +03:00

fate-run.sh

Merge remote-tracking branch 'qatar/master'

2011-10-10 03:50:58 +02:00

fate-update.sh

fate: remove stale fate-update.sh script

2011-03-19 13:35:52 +00:00

fate.mak

Merge remote-tracking branch 'qatar/master'

2011-10-08 03:39:01 +02:00

fate.sh

fate.sh: Ignore errors from rm command during cleanup.

2011-09-22 17:39:30 +02:00

ffserver-regression.sh

Remove the ffserver test.

2011-08-01 11:36:16 +02:00

ffserver.conf

Remove the ffserver test.

2011-08-01 11:36:16 +02:00

ffserver.regression.ref

Remove the ffserver test.

2011-08-01 11:36:16 +02:00

lavf-regression.sh

Merge remote-tracking branch 'qatar/master'

2011-09-12 00:32:54 +02:00

lavfi-regression.sh

Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'

2011-08-13 02:56:08 +02:00

lena.pnm

finished integrating rotozoom test in ffmpeg

2003-04-11 13:43:17 +00:00

Makefile

Merge remote-tracking branch 'qatar/master'

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

md5.sh

regtest: add openssl to md5 alternatives

2011-01-18 20:48:24 +00:00

regression-funcs.sh

Merge remote-tracking branch 'qatar/master'

2011-10-10 03:50:58 +02:00

rotozoom.c

Merge remote branch 'qatar/master'

2011-05-12 04:51:24 +02:00

tiny_psnr.c

tests: Remove disabled code.

2011-04-29 18:08:46 +02:00

videogen.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00