Imported Debian version 2.5.0~trusty1.1

[deb_ffmpeg.git] / ffmpeg / libavformat / libquvi.c

diff --git a/ffmpeg/libavformat/libquvi.c b/ffmpeg/libavformat/libquvi.c
index ca71f9fd8c1b164cb00330492999c5fc3981b502..0a593cc9cf041c4a3516de9b8fe8e24c12a6d1c2 100644 (file)
--- a/ffmpeg/libavformat/libquvi.c
+++ b/ffmpeg/libavformat/libquvi.c
@@ -22,6 +22,7 @@
 
 #include "libavformat/avformat.h"
 #include "libavformat/internal.h"
+#include "libavutil/avassert.h"
 #include "libavutil/opt.h"
 
 typedef struct {
@@ -75,6 +76,9 @@ static int libquvi_read_header(AVFormatContext *s)
     if (rc != QUVI_OK)
         goto quvi_fail;
 
+    if ((ret = ff_copy_whitelists(qc->fmtctx, s)) < 0)
+        goto end;
+
     ret = avformat_open_input(&qc->fmtctx, media_url, NULL, NULL);
     if (ret < 0)
         goto end;