1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
FFmpeg/libswscale/x86
Michael Niedermayer 7427d1ca4a Merge remote-tracking branch 'qatar/master'
* qatar/master:
  g723.1: simplify scale_vector()
  g723.1: simplify normalize_bits()
  vda: cosmetics: fix Doxygen comment formatting
  vda: better frame allocation
  vda: Merge implementation into one file
  vda: support synchronous decoding
  vda: Reuse the bitstream buffer and reallocate it only if needed
  build: Factor out mpegvideo encoding dependencies to CONFIG_MPEGVIDEOENC
  avprobe: Include libm.h for the log2 fallback
  proresenc: use the edge emulation buffer
  rtmp: handle bytes read reports
  configure: Fix typo in mpeg2video/svq1 decoder dependency declaration
  Use log2(x) instead of log(x) / log(2)
  x86: swscale: fix fragile memory accesses
  x86: swscale: remove disabled code
  x86: yadif: fix asm with suncc
  x86: cabac: allow building with suncc
  x86: mlpdsp: avoid taking address of void
  ARM: intmath: use native-size return types for clipping functions

Conflicts:
	configure
	ffprobe.c
	libavcodec/Makefile
	libavcodec/g723_1.c
	libavcodec/v210dec.h
	libavcodec/vda.h
	libavcodec/vda_h264.c
	libavcodec/x86/cabac.h
	libavfilter/x86/yadif_template.c
	libswscale/x86/rgb2rgb_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-14 15:34:39 +02:00
..
input.asm Fix compilation with old yasm that does not support AVX. 2012-02-14 12:03:55 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-07-23 21:25:09 +02:00
output.asm Merge remote-tracking branch 'qatar/master' 2012-04-13 00:39:19 +02:00
rgb2rgb_template.c Merge remote-tracking branch 'qatar/master' 2012-08-14 15:34:39 +02:00
rgb2rgb.c Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
scale.asm sws/x86: add some forgotten 12bit planar yuv cases 2012-07-05 04:38:57 +02:00
swscale_template.c Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
swscale.c Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
w64xmmtest.c win64: add a XMM clobber test configure option. 2012-02-02 12:00:48 -08:00
yuv2rgb_template.c Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
yuv2rgb.c Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00