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>

1 files changed, 1 insertions, 1 deletions

diff --git a/libavformat/cache.c b/libavformat/cache.c
index 74f008e0d1..c2bddf5f6d 100644
--- a/libavformat/cache.c
+++ b/libavformat/cache.c
@@ -72,7 +72,7 @@ static int cache_open(URLContext *h, const char *arg, int flags)
     unlink(buffername);
     av_free(buffername);
 
-    return ffurl_open(&c->inner, arg, flags);
+    return ffurl_open(&c->inner, arg, flags, &h->interrupt_callback, NULL);
 }
 
 static int cache_read(URLContext *h, unsigned char *buf, int size)