1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
FFmpeg/libswscale
Michael Niedermayer bf8bb94322 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  ffmpeg: get rid of the -vglobal option.
  dct32: Add AVX implementation of 32-point DCT
  dct32: Change pass 6 permutation to allow for AVX implementation
  dct32: port SSE 32-point DCT to YASM
  multiple inclusion guard cleanup
  avio: document buffer must created with av_malloc() and friends
  avio: check AVIOContext malloc failure
  swscale: point out an alternative to sws_getContext
  svq3: Do initialization after parsing the extradata
  add changelog entries for 0.7_beta2
  mp3lame: add #include required for AV_RB32 macro.

Conflicts:
	Changelog
	libavcodec/svq3.c
	libavcodec/x86/dct32_sse.c
	libavfilter/vsrc_buffer.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-22 04:53:19 +02:00
..
bfin Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
mlib Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
ppc [PATCH] Update pixdesc_be fate refs after adding 9/10bit YUV420P formats. 2011-05-14 06:37:39 -04:00
sparc Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
x86 swscale: fix YUV420P 9/10bit support. 2011-05-11 19:15:14 -04:00
colorspace-test.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
libswscale.v Add symbol versioning for shared libraries 2010-01-16 04:48:55 +00:00
Makefile swscale: move away x86 specific code from rgb2rgb 2011-04-14 22:16:47 +02:00
options.c AVOptions: make default_val a union, as proposed in AVOption2. 2011-05-10 20:22:06 +02:00
rgb2rgb_template.c rgb24toyv12: break out in the middle before out of array reads. 2011-05-05 02:20:20 +02:00
rgb2rgb.c Fix runtime CPU detection in libswscale. 2011-04-27 01:52:36 +02:00
rgb2rgb.h sws: remove disabled cruft. 2011-04-19 21:50:12 +02:00
swscale_internal.h Merge remote branch 'qatar/master' 2011-05-13 04:40:40 +02:00
swscale_template.c swscale: fix compile on mingw32 2011-05-14 13:22:46 +02:00
swscale-test.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
swscale.c swscale: 10l forgot git add this change from ronald. 2011-05-14 02:50:10 +02:00
swscale.h Merge remote-tracking branch 'qatar/master' 2011-05-22 04:53:19 +02:00
utils.c Merge remote branch 'qatar/master' 2011-05-13 04:40:40 +02:00
yuv2rgb.c libswcale: PIX_FMT_BGR48LE and PIX_FMT_BGR48BE scaler implementation 2011-04-28 07:25:27 +02:00