ffmpeg/libswscale
Michael Niedermayer d1c28e3530 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  build: fix standalone compilation of OMA muxer
  build: fix standalone compilation of Microsoft XMV demuxer
  build: fix standalone compilation of Core Audio Format demuxer
  kvmc: fix invalid reads
  4xm: Add a check in decode_i_frame to prevent buffer overreads
  adpcm: fix IMA SMJPEG decoding
  options: set minimum for "threads" to zero
  bsd: use number of logical CPUs as automatic thread count
  windows: use number of CPUs as automatic thread count
  linux: use number of CPUs as automatic thread count
  pthreads: reset active_thread_type when slice thread_init returrns early
  v410dec: include correct headers
  Drop ALT_ prefix from BITSTREAM_READER_LE name.
  lavfi: always build vsrc_buffer.
  ra144enc: zero the reflection coeffs if the filter is unstable
  sws: readd PAL8 to isPacked()
  mov: Don't stick the QuickTime field ordering atom in extradata.
  truespeech: fix invalid reads in truespeech_apply_twopoint_filter()

Conflicts:
	configure
	libavcodec/4xm.c
	libavcodec/avcodec.h
	libavfilter/Makefile
	libavfilter/allfilters.c
	libavformat/Makefile
	libswscale/swscale_internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-23 03:25:51 +01:00
..
bfin
mlib
ppc
sparc
x86 Merge remote-tracking branch 'qatar/master' 2011-12-14 23:58:10 +01:00
colorspace-test.c
libswscale.v
Makefile Merge remote-tracking branch 'qatar/master' 2011-12-13 23:21:37 +01:00
options.c
rgb2rgb_template.c
rgb2rgb.c Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
rgb2rgb.h
swscale_internal.h Merge remote-tracking branch 'qatar/master' 2011-12-23 03:25:51 +01:00
swscale_unscaled.c Merge remote-tracking branch 'qatar/master' 2011-12-20 04:12:09 +01:00
swscale-test.c
swscale.c swscale: fix overflows in vertical scaling at top/bottom edges. 2011-12-18 08:27:43 -08:00
swscale.h libswscale: increase LIBSWSCALE_VERSION_MICRO to 100 2011-12-22 03:07:57 +01:00
utils.c libswscale: increase LIBSWSCALE_VERSION_MICRO to 100 2011-12-22 03:07:57 +01:00
yuv2rgb.c