ffmpeg/libswscale
Michael Niedermayer c065255bba Merge remote-tracking branch 'qatar/master'
* qatar/master:
  aacenc: Fix LONG_START windowing.
  aacenc: Fix a bug where deinterleaved samples were stored in the wrong place.
  avplay: use the correct array size for stride.
  lavc: extend doxy for avcodec_alloc_context3().
  APIchanges: mention avcodec_alloc_context()/2/3
  avcodec_align_dimensions2: set only 4 linesizes, not AV_NUM_DATA_POINTERS.
  aacsbr: ARM NEON optimised sbrdsp functions
  aacsbr: align some arrays
  aacsbr: move some simdable loops to function pointers
  cosmetics: Remove extra newlines at EOF

Conflicts:
	libavcodec/utils.c
	libavfilter/formats.c
	libavutil/mem.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-29 00:34:59 +01:00
..
bfin
mlib
ppc Merge remote-tracking branch 'qatar/master' 2012-01-26 02:23:56 +01:00
sparc
x86 Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-01-10 03:50:41 +01:00
colorspace-test.c Merge remote-tracking branch 'qatar/master' 2012-01-10 03:50:41 +01:00
libswscale.v
options.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
rgb2rgb.c Merge remote-tracking branch 'qatar/master' 2012-01-29 00:34:59 +01:00
rgb2rgb.h Merge remote-tracking branch 'qatar/master' 2012-01-14 02:22:09 +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
swscale-test.c Merge remote-tracking branch 'qatar/master' 2012-01-14 02:22:09 +01:00
swscale.c swscale: fix conversion into yuva444p from non-alpha formats 2012-01-28 17:37:08 +01:00
swscale.h Merge remote-tracking branch 'qatar/master' 2012-01-10 03:50:41 +01:00
swscale_internal.h sws: Fix RGB0->alpha containing formats. 2012-01-24 17:01:10 +01:00
swscale_unscaled.c sws: Fix RGB0->alpha containing formats. 2012-01-24 17:01:10 +01:00
utils.c Merge remote-tracking branch 'qatar/master' 2012-01-29 00:34:59 +01:00
yuv2rgb.c yuv2rgb: better check if source format have alpha 2012-01-28 17:37:08 +01:00