ffmpeg/libswscale
Michael Niedermayer bbb61a1cd5 Merge remote-tracking branch 'qatar/master'
* qatar/master: (22 commits)
  als: prevent infinite loop in zero_remaining().
  cook: prevent div-by-zero if channels is zero.
  pamenc: switch to encode2().
  svq1enc: switch to encode2().
  dvenc: switch to encode2().
  dpxenc: switch to encode2().
  pngenc: switch to encode2().
  v210enc: switch to encode2().
  xwdenc: switch to encode2().
  ttadec: use branchless unsigned-to-signed unfolding
  avcodec: add a Sun Rasterfile encoder
  sunrast: Move common defines to a new header file.
  cdxl: fix video decoding for some files
  cdxl: fix audio for some samples
  apetag: add proper support for binary tags
  ttadec: remove dead code
  swscale: make access to filter data conditional on filter type.
  swscale: update context offsets after removal of AlpMmxFilter.
  prores: initialise encoder and decoder parts only when needed
  swscale: make monowhite/black RGB-independent.
  ...

Conflicts:
	Changelog
	libavcodec/alsdec.c
	libavcodec/dpxenc.c
	libavcodec/golomb.h
	libavcodec/pamenc.c
	libavcodec/pngenc.c
	libavformat/img2.c
	libswscale/output.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-18 02:20:19 +01:00
..
bfin Merge remote-tracking branch 'qatar/master' 2012-02-03 03:51:32 +01:00
ppc Merge remote-tracking branch 'qatar/master' 2012-02-10 01:20:07 +01:00
sparc Merge remote-tracking branch 'qatar/master' 2012-02-08 05:53:35 +01:00
x86 Merge remote-tracking branch 'qatar/master' 2012-02-18 02:20:19 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-02-09 01:27:12 +01:00
colorspace-test.c swscale-test: Drop unused argc and argv arguments from main(). 2012-02-01 14:24:25 +01:00
input.c Merge remote-tracking branch 'qatar/master' 2012-02-08 05:53:35 +01:00
libswscale.v
options.c
output.c Merge remote-tracking branch 'qatar/master' 2012-02-18 02:20:19 +01: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
swscale-test.c Merge remote-tracking branch 'qatar/master' 2012-01-14 02:22:09 +01:00
swscale.c Merge remote-tracking branch 'qatar/master' 2012-02-14 01:53:31 +01:00
swscale.h Merge remote-tracking branch 'qatar/master' 2012-01-10 03:50:41 +01:00
swscale_internal.h Merge remote-tracking branch 'qatar/master' 2012-02-18 02:20:19 +01:00
swscale_unscaled.c Merge remote-tracking branch 'qatar/master' 2012-02-08 05:53:35 +01:00
utils.c Merge remote-tracking branch 'qatar/master' 2012-02-12 01:06:13 +01:00
yuv2rgb.c Merge remote-tracking branch 'qatar/master' 2012-02-09 01:27:12 +01:00