Files
ffmpeg/libavformat
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
..
2011-11-05 16:51:25 +01:00
2011-11-08 00:36:45 +02:00
2011-08-01 00:58:49 +02:00
2011-08-22 09:35:58 +02:00
2011-08-09 19:56:25 +02:00
2011-11-08 17:39:39 +01:00
2011-10-29 22:08:25 +02:00
2011-11-03 20:21:01 +01:00
2011-04-04 01:29:40 +02:00
2011-04-20 04:48:23 +02:00
2011-11-02 20:41:24 +01:00
2011-08-09 19:56:25 +02:00
2011-06-02 20:06:00 +01:00
2011-10-13 16:50:20 +02:00
2011-11-12 01:21:01 +01:00
2011-04-04 02:15:12 +02:00
2011-04-24 03:41:22 +02:00
2011-10-17 16:51:48 +02:00
2011-11-06 11:53:05 +02:00
2011-11-06 01:53:46 +01:00
2011-11-12 00:15:03 +01:00