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-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-21 02:01:26 +02:00
2011-11-05 15:07:19 +01:00
2011-10-21 02:01:26 +02:00
2011-10-20 02:34:51 +02:00
2011-11-12 02:50:25 +01:00
2011-10-20 02:34:51 +02:00
2011-11-13 05:19:28 +01:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-11-14 00:33:39 +01:00
2011-11-14 00:33:39 +01:00
2011-11-05 16:51:25 +01:00
2011-11-03 02:16:26 +01:00
2011-11-11 23:49:30 +01:00
2011-10-20 02:34:51 +02:00
2011-11-03 02:16:26 +01:00
2011-11-08 10:35:14 +01:00
2011-11-11 02:50:35 +01:00
2011-11-14 00:33:39 +01:00
2011-11-06 11:52:57 +02:00
2011-11-14 00:33:39 +01:00
2011-11-14 00:33:39 +01:00
2011-11-14 00:33:39 +01:00
2011-11-14 00:33:39 +01:00
2011-11-03 02:16:26 +01:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-11-05 15:07:19 +01:00
2011-10-30 15:39:26 +01:00
2011-11-08 00:36:45 +02:00
2011-10-20 02:34:51 +02:00
2011-11-14 00:33:39 +01:00
2011-11-03 20:22:10 +01:00
2011-10-20 02:34:51 +02:00
2011-11-14 00:33:39 +01:00
2011-11-13 13:14:39 +01:00
2011-11-03 02:16:26 +01:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-30 01:33:41 +02:00
2011-11-03 02:16:26 +01:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-21 02:01:26 +02:00
2011-11-03 02:16:26 +01:00
2011-10-20 02:34:51 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-11-02 10:43:39 +01:00
2011-10-20 02:34:51 +02:00
2011-11-08 17:39:39 +01:00
2011-11-03 02:16:26 +01:00
2011-11-05 15:07:19 +01:00
2011-10-29 22:08:25 +02:00
2011-10-13 06:00:03 +02:00
2011-11-14 00:33:39 +01:00
2011-11-02 19:36:04 -04:00
2011-11-01 18:41:46 +01:00
2011-11-14 00:33:39 +01:00
2011-11-11 02:50:35 +01:00
2011-11-12 02:50:25 +01:00
2011-11-03 02:16:26 +01:00
2011-10-24 01:01:21 +02:00
2011-11-03 20:21:01 +01:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-11-10 03:45:23 +01:00
2011-11-14 00:33:39 +01:00
2011-11-08 10:35:14 +01:00
2011-10-20 02:34:51 +02:00
2011-11-08 10:33:21 +01:00
2011-10-29 02:08:54 +02:00
2011-10-20 02:34:51 +02:00
2011-10-28 03:05:16 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-21 02:01:26 +02:00
2011-10-28 21:46:30 +02:00
2011-11-05 15:07:19 +01:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-11-05 15:07:19 +01:00
2011-10-20 02:34:51 +02:00
2011-11-13 05:19:28 +01:00
2011-11-06 02:23:34 +01:00
2011-11-08 02:03:14 +01:00
2011-11-14 00:33:39 +01:00
2011-11-06 11:52:57 +02:00
2011-11-05 15:07:19 +01:00
2011-11-13 05:19:28 +01:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-11-14 00:33:39 +01:00
2011-11-14 00:33:39 +01:00
2011-11-14 00:33:39 +01:00
2011-11-05 12:35:34 +02:00
2011-11-02 10:42:54 +01:00
2011-10-21 02:01:26 +02:00
2011-11-06 11:52:57 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-26 02:36:07 +02:00
2011-11-08 18:56:39 +01:00
2011-10-29 02:08:54 +02:00
2011-11-02 20:41:24 +01:00
2011-11-08 23:54:25 +01:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-11-09 02:59:49 +01:00
2011-10-13 06:00:03 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-11-08 02:03:14 +01:00
2011-11-08 02:03:14 +01:00
2011-11-02 10:42:54 +01:00
2011-11-06 11:52:57 +02:00
2011-10-21 02:01:26 +02:00
2011-10-20 02:34:51 +02:00
2011-10-29 02:08:54 +02:00
2011-11-02 10:43:39 +01:00
2011-10-25 15:04:51 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-10-20 13:06:16 -04:00
2011-10-20 20:57:23 +02:00
2011-10-20 02:34:51 +02:00
2011-11-14 00:33:39 +01:00
2011-11-07 03:01:43 +01:00
2011-11-03 02:16:26 +01:00
2011-10-13 06:00:03 +02:00
2011-11-05 15:07:19 +01:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-11-03 02:16:26 +01:00
2011-10-13 16:50:20 +02:00
2011-10-13 06:00:03 +02:00
2011-11-08 02:03:14 +01:00
2011-11-12 01:21:01 +01:00
2011-10-20 02:34:51 +02:00
2011-11-08 02:03:14 +01:00
2011-10-20 02:34:51 +02:00
2011-11-03 02:16:26 +01:00
2011-10-20 02:34:51 +02:00
2011-11-14 00:33:39 +01:00
2011-10-18 01:54:40 +02:00
2011-11-07 21:55:34 +01:00
2011-11-07 21:55:34 +01:00
2011-11-07 03:01:43 +01:00
2011-11-06 11:52:57 +02:00
2011-11-12 02:50:25 +01:00
2011-10-13 06:00:03 +02:00
2011-11-14 00:33:39 +01:00
2011-10-21 02:01:26 +02:00
2011-10-18 01:54:40 +02:00
2011-10-13 06:00:03 +02:00
2011-11-14 00:33:39 +01:00
2011-11-14 00:33:39 +01:00
2011-11-03 02:16:26 +01:00
2011-10-18 01:54:40 +02:00
2011-10-18 01:54:40 +02:00
2011-11-14 00:33:39 +01:00
2011-11-14 00:33:39 +01:00
2011-10-21 02:01:26 +02:00
2011-10-29 02:08:54 +02:00
2011-10-20 02:34:51 +02:00
2011-10-17 16:51:48 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-21 02:01:26 +02:00
2011-10-30 15:43:19 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-11-14 00:33:39 +01:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-11-13 13:14:39 +01:00
2011-10-20 02:34:51 +02:00
2011-10-26 02:36:07 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-11-10 03:45:23 +01:00
2011-11-14 00:33:39 +01:00
2011-11-14 00:33:39 +01:00
2011-10-20 02:34:51 +02:00
2011-11-08 02:03:14 +01:00
2011-10-20 02:34:51 +02:00
2011-11-12 02:50:25 +01:00
2011-11-05 15:07:19 +01:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +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
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
5f268ca5c5