ffmpeg/tests
Michael Niedermayer e161b079de Merge remote-tracking branch 'qatar/master'
* qatar/master: (22 commits)
  configure: add check for w32threads to enable it automatically
  rtmp: do not hardcode invoke numbers
  cinepack: return non-generic errors
  fate-lavf-ts: use -mpegts_transport_stream_id option.
  Add an APIchanges entry and a minor bump for avio changes.
  avio: Mark the old interrupt callback mechanism as deprecated
  avplay: Set the new interrupt callback
  avconv: Set new interrupt callbacks for all AVFormatContexts, use avio_open2() everywhere
  cinepak: remove redundant coordinate checks
  cinepak: check strip_size
  cinepak, simplify, use AV_RB24()
  cinepak: simplify, use FFMIN()
  cinepak: Fix division by zero, ask for sample if encoded_buf_size is 0
  applehttp: Fix seeking in streams not starting at DTS=0
  http: Don't use the normal http proxy mechanism for https
  tls: Handle connection via a http proxy
  http: Reorder two code blocks
  http: Add a new protocol for opening connections via http proxies
  http: Split out the non-chunked buffer reading part from http_read
  segafilm: add support for raw videos
  ...

Conflicts:
	avconv.c
	configure
	doc/APIchanges
	libavcodec/cinepak.c
	libavformat/applehttp.c
	libavformat/version.h
	tests/lavf-regression.sh
	tests/ref/lavf/ts

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-19 02:00:06 +01:00
..
fate Merge remote-tracking branch 'qatar/master' 2011-10-14 22:24:00 +02:00
ref Merge remote-tracking branch 'qatar/master' 2011-11-19 02:00:06 +01:00
Makefile fate: add --timeout=60 --contimeout=60 to fate-rsync 2011-11-07 15:13:16 +01:00
audiogen.c
base64.c
codec-regression.sh Add prores regression test. 2011-10-29 16:19:34 +02:00
copycooker.sh
fate-run.sh Merge remote-tracking branch 'qatar/master' 2011-10-10 03:50:58 +02:00
fate-update.sh
fate.mak Merge remote-tracking branch 'qatar/master' 2011-10-08 03:39:01 +02:00
fate.sh
fate2.mak fate: fix mapchan 2011-11-06 03:01:01 +01:00
ffserver-regression.sh
ffserver.conf
ffserver.regression.ref
lavf-regression.sh Merge remote-tracking branch 'qatar/master' 2011-11-19 02:00:06 +01:00
lavfi-regression.sh
lena.pnm
md5.sh
regression-funcs.sh Merge remote-tracking branch 'qatar/master' 2011-10-10 03:50:58 +02:00
rotozoom.c
tiny_psnr.c tests: Remove disabled code. 2011-04-29 18:08:46 +02:00
videogen.c