ffmpeg/libswscale
Michael Niedermayer d8cab5c26b Merge remote-tracking branch 'qatar/master'
* qatar/master:
  http: Remove the custom function for disabling chunked posts
  rtsp: Disable chunked http post through AVOptions
  movdec: Set frame_size for AMR
  h264_weight: remove duplication functions.
  swscale: align vertical filtersize by 2 on x86.
  libavfilter: reindent.
  matroskadec: empty blocks are in fact valid.
  avfilter: don't abort() on zero-size allocations.
  h264: improve calculation of codec delay.
  movenc: Set a correct packet size for AMR-NB mode 15, "no data"
  avformat: Add functions for doing global network initialization
  avformat: Add the https protocol
  avformat: Add the tls protocol, using OpenSSL or gnutls
  avformat: Initialize gnutls in ff_tls_init()
  w32threads: Wrap the mutex functions in inline functions returning int
  configure: Allow linking to the gnutls library
  avformat: Add ff_tls_init()/deinit() that initialize OpenSSL
  configure: Allow linking to openssl
  avcodec: Allow locking and unlocking an avformat specific mutex
  avformat: Split out functions from network.h to a new file, network.c

Conflicts:
	Changelog
	configure
	doc/APIchanges
	libavcodec/internal.h
	libavcodec/version.h
	libavfilter/formats.c
	libavformat/matroskadec.c
	libavformat/mov.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-06 02:23:34 +01:00
..
bfin
mlib
ppc Merge remote-tracking branch 'qatar/master' 2011-10-23 05:13:56 +02:00
sparc
x86 sws: fallback to mmx2 when yuv2yuvX_sse3() cannot be used. 2011-10-31 01:53:37 +01:00
colorspace-test.c
libswscale.v
Makefile Compile x86/swscale_template with -mno-red-zone. 2011-09-25 16:59:52 +02:00
options.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
rgb2rgb_template.c
rgb2rgb.c lsws: remove deprecated and unused stuff after the 0->1 major bump 2011-08-04 00:23:00 +02:00
rgb2rgb.h lsws: remove deprecated and unused stuff after the 0->1 major bump 2011-08-04 00:23:00 +02:00
swscale_internal.h sws: add yuv2yuvX() back and updated to the just 1 plane API 2011-10-23 19:31:55 +02:00
swscale_unscaled.c sws: fix warning: new qualifiers in middle of multi-level non-const cast are unsafe warning. 2011-10-22 05:21:01 +02:00
swscale-test.c sws-test: Fix data alignment 2011-10-23 23:35:28 +02:00
swscale.c sws: print a warning on unaligned input on SSE2+ 2011-10-31 01:53:37 +01:00
swscale.h Merge remote-tracking branch 'qatar/master' 2011-09-04 04:11:53 +02:00
utils.c Merge remote-tracking branch 'qatar/master' 2011-11-06 02:23:34 +01:00
yuv2rgb.c Merge remote-tracking branch 'qatar/master' 2011-10-22 01:16:41 +02:00