Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Nov 2011 22:43:12 +0000 (23:43 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Nov 2011 23:33:39 +0000 (00:33 +0100)
commit5f268ca5c57f3ad3050b58f513651c17304d3653
treef66ad7e5c4fd5656db9a95218f2ad433a982d81b
parent4fa6e9d0b40653010b35278f7e8b556958341205
parent32caa7b13cecca59213c73fa94dd683c2b003bfd
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>
29 files changed:
doc/indevs.texi
doc/t2h.init
libavformat/applehttp.c
libavformat/applehttpproto.c
libavformat/avformat.h
libavformat/avio.c
libavformat/avio.h
libavformat/avio_internal.h
libavformat/aviobuf.c
libavformat/cache.c
libavformat/concat.c
libavformat/gopher.c
libavformat/http.c
libavformat/img2.c
libavformat/md5proto.c
libavformat/mmsh.c
libavformat/mmst.c
libavformat/mov.c
libavformat/options.c
libavformat/rtmpproto.c
libavformat/rtpenc_chain.c
libavformat/rtpproto.c
libavformat/rtsp.c
libavformat/sapdec.c
libavformat/sapenc.c
libavformat/tcp.c
libavformat/url.h
libavformat/utils.c
libswscale/x86/scale.asm