virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity
f9ecb849ef
FFmpeg/libswscale/x86
History
Michael Niedermayer f9ecb849ef Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  crypto: Use av_freep instead of av_free
  lavf: don't try to free private options if priv_data is NULL.
  swscale: fix types of assembly arguments.
  swscale: move two macros that are only used once into caller.
  swscale: remove unused function.
  options: Add missing braces around struct initializer.
  mov: Remove leftover crufty debug statement with references to a local file.
  dvbsubdec: Fix compilation of debug code.
  Remove all uses of now deprecated metadata functions.
  Move metadata API from lavf to lavu.

Conflicts:
	doc/APIchanges
	libavformat/aiffdec.c
	libavformat/asfdec.c
	libavformat/avformat.h
	libavformat/avidec.c
	libavformat/cafdec.c
	libavformat/matroskaenc.c
	libavformat/mov.c
	libavformat/mp3enc.c
	libavformat/wtv.c
	libavutil/avutil.h
	libavutil/internal.h
	libswscale/swscale.c
	libswscale/x86/swscale_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-09 04:47:19 +02:00
..
rgb2rgb_template.c Merge remote-tracking branch 'qatar/master' into master 2011-05-29 03:34:35 +02:00
rgb2rgb.c rgb2rgb: remove duplicate mmx/mmx2/3dnow/sse2 functions. 2011-05-28 11:41:32 +02:00
swscale_mmx.c Merge remote-tracking branch 'qatar/master' 2011-06-04 06:35:17 +02:00
swscale_template.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
yuv2rgb_mmx.c swscale: Commits that could not be pulled earlier due to bugs #2 2011-05-29 02:14:45 +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