ffmpeg/libswscale
Michael Niedermayer 5f268ca5c5 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  lavf: pass options from AVFormatContext to avio.
  avformat: Use avio_open2, pass the AVFormatContext interrupt_callback onwards
  avio: add avio_open2, taking an interrupt callback and options
  avio: add support for passing options to protocols.
  avio: add and use ffurl_protocol_next().
  avformat: Pass the interrupt callback on to chained muxers/demuxers
  avio: Add an AVIOInterruptCB parameter to ffurl_open/ffurl_alloc
  avformat: Use ff_check_interrupt
  avio: Add an internal utility function for checking the new interrupt callback
  avio: Add AVIOInterruptCB
  texi2html: remove stray \n
  doc: prettyfy the texi2html documentation
  swscale: handle unaligned buffers in yuv2plane1

Conflicts:
	libavformat/avformat.h
	libavformat/avio.c
	libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-14 00:33:39 +01:00
..
bfin
mlib
ppc
sparc
x86 Merge remote-tracking branch 'qatar/master' 2011-11-14 00:33:39 +01:00
Makefile
colorspace-test.c
libswscale.v
options.c
rgb2rgb.c Use more accurate conversion for rgb15/16 to rgb24/32 (C/MMX). 2011-11-09 01:58:22 +01:00
rgb2rgb.h
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
swscale.c sws: print a warning on unaligned input on SSE2+ 2011-10-31 01:53:37 +01:00
swscale.h
swscale_internal.h
swscale_unscaled.c swscale: use isByteRGB() to simplify check for palToRgbWrapper. 2011-11-06 13:30:10 +01:00
utils.c swscale: add padding to conversion buffer. 2011-11-11 07:44:35 -08:00
yuv2rgb.c