Michael Niedermayer c88caa522c Merge remote branch 'qatar/master' ...

* qatar/master:
  proto: include os_support.h in network.h
  matroskaenc: don't write an empty Cues element.
  lavc: add a FF_API_REQUEST_CHANNELS deprecation macro
  avio: move extern url_interrupt_cb declaration from avio.h to url.h
  avio: make av_register_protocol2 internal.
  avio: avio_ prefix for url_set_interrupt_cb.
  avio: AVIO_ prefixes for URL_ open flags.
  proto: introduce listen option in tcp
  doc: clarify configure features
  proto: factor ff_network_wait_fd and use it on udp

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2011-04-08 02:50:13 +02:00

..

fate

fate: add AAC LATM test

2011-04-06 20:55:58 +02:00

ref

Merge remote branch 'qatar/master'

2011-04-08 02:50:13 +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

Fix qtrle regression test, actually test qtrle.

2011-02-11 23:47:09 +00:00

copy.regression.ref

Make sure we dont double test files and sort the list.

2010-03-02 17:16:25 +00:00

copycooker.sh

Make sure we dont double test files and sort the list.

2010-03-02 17:16:25 +00:00

fate2.mak

Increase STDDEV tolerance for the fate-amrwb-14k25 test so it pass in

2010-12-20 22:01:48 +00:00

fate-run.sh

fate: add support for multithread testing

2011-03-23 01:17:20 +01:00

fate-update.sh

fate: remove stale fate-update.sh script

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

fate.mak

Split fate-psx-str-v3 into a video-only and audio-only test.

2011-03-26 16:39:22 -04:00

fate.sh

get rid of the last svn mentions

2011-03-18 21:57:38 +01:00

ffserver-regression.sh

Make ffserver regression test run (still fails)

2010-03-08 00:27:00 +00:00

ffserver.conf

Rename test.conf --> ffserver.conf, the new name is more meaningful.

2009-03-29 20:17:23 +00:00

ffserver.regression.ref

update ffserver regression ref

2009-03-21 10:03:37 +00:00

lavf-regression.sh

Add regression test for stereo s16le in voc.

2011-01-19 12:51:42 +00:00

lavfi-regression.sh

fate: make lavfi tests output only md5

2011-01-22 00:30:12 +00:00

lena.pnm

finished integrating rotozoom test in ffmpeg

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

md5.sh

regtest: add openssl to md5 alternatives

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

regression-funcs.sh

fate: simplify regression-funcs.sh

2011-03-23 01:17:20 +01:00

rotozoom.c

Replace FFmpeg with Libav in licence headers

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

seek_test.c

Replace FFmpeg with Libav in licence headers

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

tiny_psnr.c

Replace FFmpeg with Libav in licence headers

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

videogen.c

Replace FFmpeg with Libav in licence headers

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