ffmpeg/tests
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
base64.c
codec-regression.sh
copy.regression.ref
copycooker.sh
fate2.mak
fate-run.sh
fate-update.sh
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
ffserver-regression.sh
ffserver.conf
ffserver.regression.ref
lavf-regression.sh
lavfi-regression.sh
lena.pnm
md5.sh
regression-funcs.sh
rotozoom.c
seek_test.c
tiny_psnr.c
videogen.c