ffmpeg/libavcodec/x86
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
..
Makefile
ac3dsp.asm
ac3dsp_mmx.c
cabac.h
cavsdsp_mmx.c
dct32_sse.asm
deinterlace.asm
diracdsp_mmx.c
diracdsp_mmx.h
diracdsp_yasm.asm
dnxhd_mmx.c
dsputil_mmx.c
dsputil_mmx.h
dsputil_mmx_avg_template.c
dsputil_mmx_qns_template.c
dsputil_mmx_rnd_template.c
dsputil_yasm.asm
dsputilenc_mmx.c
dsputilenc_yasm.asm
dwt.c
dwt.h
dwt_yasm.asm
fdct_mmx.c Make fdct_r_row_sse2 const. 2011-11-05 15:37:02 +01:00
fft.c
fft.h
fft_3dn.c
fft_3dn2.c
fft_mmx.asm
fft_sse.c
fmtconvert.asm
fmtconvert_mmx.c
h264_chromamc.asm
h264_chromamc_10bit.asm
h264_deblock.asm
h264_deblock_10bit.asm
h264_i386.h
h264_idct.asm
h264_idct_10bit.asm
h264_intrapred.asm
h264_intrapred_10bit.asm
h264_intrapred_init.c
h264_qpel_10bit.asm
h264_qpel_mmx.c
h264_weight.asm Merge remote-tracking branch 'qatar/master' 2011-11-06 02:23:34 +01:00
h264_weight_10bit.asm
h264dsp_mmx.c
idct_mmx.c
idct_mmx_xvid.c
idct_sse2_xvid.c
idct_xvid.h
lpc_mmx.c
mathops.h
mlpdsp.c
motion_est_mmx.c
mpegaudiodec_mmx.c
mpegvideo_mmx.c
mpegvideo_mmx_template.c mpegvideo: support encoding with chroma intra tables that differ from luma. 2011-09-25 12:29:20 +02:00
png_mmx.c
proresdsp-init.c
proresdsp.asm
rv40dsp.c
simple_idct_mmx.c
snowdsp_mmx.c
v210-init.c
v210.asm
vc1dsp_mmx.c
vc1dsp_yasm.asm
vp3dsp.asm
vp8dsp-init.c
vp8dsp.asm
vp56_arith.h
vp56dsp.asm
vp56dsp_init.c