Mirror of https://git.ffmpeg.org/ffmpeg.git https://ffmpeg.org/

Tree: b87d882578

FFmpeg/libswscale

History

Michael Niedermayer b81f8880e0 Merge remote-tracking branch 'qatar/master' ... * qatar/master: (23 commits) fix AC3ENC_OPT_MODE_ON/OFF h264: fix HRD parameters parsing prores: implement multithreading. prores: idct sse2/sse4 optimizations. swscale: use aligned move for storage into temporary buffer. prores: extract idct into its own dspcontext and merge with put_pixels. h264: fix invalid shifts in init_cavlc_level_tab() intfloat_readwrite: fix signed addition overflows mov: do not misreport empty stts mov: cosmetics, fix for and if spacing id3v2: fix NULL pointer dereference mov: read album_artist atom mov: fix disc/track numbers and totals doc: fix references to obsolete presets directories for avconv/ffmpeg flashsv: return more meaningful error value flashsv: fix typo in av_log() message smacker: validate channels and sample format. smacker: check buffer size before reading output size smacker: validate number of channels smacker: Separate audio flags from sample rates in smacker demuxer. ... Conflicts: cmdutils.h doc/ffmpeg.texi libavcodec/Makefile libavcodec/motion_est_template.c libavformat/id3v2.c libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		14 years ago
..
bfin	Merge remote-tracking branch 'qatar/master'	14 years ago
mlib	Replace FFmpeg with Libav in licence headers	14 years ago
ppc	Merge remote-tracking branch 'qatar/master'	14 years ago
sparc	Replace FFmpeg with Libav in licence headers	14 years ago
x86	Merge remote-tracking branch 'qatar/master'	14 years ago
Makefile	Compile x86/swscale_template with -mno-red-zone.	14 years ago
colorspace-test.c	Merge remote-tracking branch 'qatar/master' into master	14 years ago
libswscale.v	Add symbol versioning for shared libraries	15 years ago
options.c	Merge remote-tracking branch 'qatar/master'	14 years ago
rgb2rgb.c	lsws: remove deprecated and unused stuff after the 0->1 major bump	14 years ago
rgb2rgb.h	lsws: remove deprecated and unused stuff after the 0->1 major bump	14 years ago
rgb2rgb_template.c	Merge remote-tracking branch 'qatar/master'	14 years ago
swscale-test.c	swscale: Remove commented-out printf cruft.	14 years ago
swscale.c	sws: gbr24p input support	14 years ago
swscale.h	Merge remote-tracking branch 'qatar/master'	14 years ago
swscale_internal.h	sws: gbr24p input support	14 years ago
swscale_unscaled.c	sws: gbr24p input support	14 years ago
utils.c	sws: gbr24p input support	14 years ago
yuv2rgb.c	swscale: remove sws_format_name()	14 years ago