1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
FFmpeg/libswscale/x86
Michael Niedermayer e462257242 Merge remote-tracking branch 'qatar/master'
* qatar/master: (23 commits)
  applehttp: Properly clean up if unable to probe a segment
  applehttp: Avoid reading uninitialized memory
  fate: Replace misleading "aac" in the name of an ADTS test with "adts".
  fate: Drop pointless "-an" from pictor test command.
  fate: split off image codec FATE tests into their own file
  fate: split off WMA codec FATE tests into their own file
  fate: split off lossless video and audio FATE tests into their own files
  fate: split off qtrle codec FATE tests into their own file
  fate: split off Ut Video codec FATE tests into their own file
  fate: split off screen codec FATE tests into their own file
  fate: split off Real Inc. codec FATE tests into their own file
  fate: split off AC-3 codec FATE tests into their own file
  mpegvideo: remove abort() in ff_find_unused_picture()
  rv40: NEON optimised loop filter strength selection
  rv40: rearrange loop filter functions
  configure: cosmetics: sort some lists where appropriate
  swscale_mmx: drop no longer required parameters from VSCALEX macros
  swscale: Mark yuv2planeX_8_mmx as MMX2; it contains MMX2 instructions.
  build: conditionally compile x86 H.264 chroma optimizations
  v410 encoder and decoder
  ...

Conflicts:
	Changelog
	configure
	doc/developer.texi
	doc/general.texi
	libavcodec/arm/asm.S
	libavcodec/avcodec.h
	libavcodec/v410dec.c
	libavcodec/v410enc.c
	libavcodec/version.h
	libavcodec/x86/Makefile
	libavcodec/x86/dsputil_mmx.c
	libswscale/x86/swscale_mmx.c
	tests/Makefile
	tests/fate2.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-14 23:58:10 +01:00
..
rgb2rgb_template.c Use more accurate conversion for rgb15/16 to rgb24/32 (C/MMX). 2011-11-09 01:58:22 +01:00
rgb2rgb.c Use more accurate conversion for rgb15/16 to rgb24/32 (C/MMX). 2011-11-09 01:58:22 +01:00
scale.asm Merge remote-tracking branch 'qatar/master' 2011-12-14 23:58:10 +01:00
swscale_mmx.c Merge remote-tracking branch 'qatar/master' 2011-12-14 23:58:10 +01:00
swscale_template.c sws: remove unused variable 2011-12-03 00:04:42 +01:00
yuv2rgb_mmx.c Merge remote-tracking branch 'qatar/master' 2011-06-16 03:53:58 +02:00
yuv2rgb_template.c In libswscale, use all lines when converting from 422p to rgb with mmx, improve quality. 2011-06-03 03:46:13 +02:00