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 dirac: enable diracdsp_mmx 2011-10-30 23:28:48 +01:00
ac3dsp.asm Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00
ac3dsp_mmx.c Merge remote-tracking branch 'qatar/master' 2011-10-21 02:01:26 +02:00
cabac.h
cavsdsp_mmx.c
dct32_sse.asm Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00
deinterlace.asm Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00
diracdsp_mmx.c dirac: put_dirac_pixels8_mmx() does not work yet, thus disable it. 2011-10-30 23:27:38 +01:00
diracdsp_mmx.h DIRAC Decoder stable version, MMX support removed. 2011-10-30 21:50:08 +01:00
diracdsp_yasm.asm dirac: alignment for dirac_hpel_filter_v has been fixed 2011-10-31 17:03:03 +01:00
dnxhd_mmx.c
dsputil_mmx.c DIRAC Decoder stable version, MMX support removed. 2011-10-30 21:50:08 +01:00
dsputil_mmx.h
dsputil_mmx_avg_template.c
dsputil_mmx_qns_template.c
dsputil_mmx_rnd_template.c
dsputil_yasm.asm Merge remote-tracking branch 'qatar/master' 2011-10-22 01:16:41 +02:00
dsputilenc_mmx.c
dsputilenc_yasm.asm Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00
dwt.c dirac: fix horizontal_compose_dd97i_ssse3 2011-11-01 22:01:11 +01:00
dwt.h DIRAC Decoder stable version, MMX support removed. 2011-10-30 21:50:08 +01:00
dwt_yasm.asm dirac: drop unused END_HORIZONTAL 2011-11-01 22:01:11 +01:00
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 Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00
fft_sse.c
fmtconvert.asm Merge remote-tracking branch 'qatar/master' 2011-11-04 01:44:06 +01:00
fmtconvert_mmx.c Merge remote-tracking branch 'qatar/master' 2011-10-22 01:16:41 +02:00
h264_chromamc.asm Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00
h264_chromamc_10bit.asm
h264_deblock.asm Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00
h264_deblock_10bit.asm Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00
h264_i386.h
h264_idct.asm Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00
h264_idct_10bit.asm Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00
h264_intrapred.asm Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00
h264_intrapred_10bit.asm Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00
h264_intrapred_init.c h264: 4:2:2 intra decoding support 2011-10-21 01:00:41 -07:00
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 h264_weight: initialize "height" function argument properly. 2011-10-22 00:23:24 -07:00
h264dsp_mmx.c Merge remote-tracking branch 'qatar/master' 2011-10-22 01:16:41 +02:00
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
png_mmx.c
proresdsp-init.c Merge remote-tracking branch 'qatar/master' 2011-10-21 02:01:26 +02:00
proresdsp.asm proresdsp: fix rounding 2011-10-12 22:18:35 +02:00
rv40dsp.c
simple_idct_mmx.c
snowdsp_mmx.c
v210-init.c Add V210 SIMD 2011-10-19 20:26:55 +02:00
v210.asm Add V210 SIMD 2011-10-19 20:26:55 +02:00
vc1dsp_mmx.c
vc1dsp_yasm.asm Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00
vp3dsp.asm Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00
vp8dsp-init.c Merge remote-tracking branch 'qatar/master' 2011-10-21 02:01:26 +02:00
vp8dsp.asm Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00
vp56_arith.h
vp56dsp.asm Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00
vp56dsp_init.c