[FFmpeg-cvslog] avformat/libquvi: Forward whitelists to subdemuxer

Michael Niedermayer git at videolan.org
Thu Oct 23 18:38:33 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Oct 23 16:04:45 2014 +0200| [ad5f861b8ce34dd5a3c643bc50a1b8c82138bbcd] | committer: Michael Niedermayer

avformat/libquvi: Forward whitelists to subdemuxer

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ad5f861b8ce34dd5a3c643bc50a1b8c82138bbcd
---

 libavformat/libquvi.c |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libavformat/libquvi.c b/libavformat/libquvi.c
index ca71f9f..633ff0b 100644
--- a/libavformat/libquvi.c
+++ b/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,10 @@ static int libquvi_read_header(AVFormatContext *s)
     if (rc != QUVI_OK)
         goto quvi_fail;
 
+    av_assert0(!qc->fmtctx->codec_whitelist && !qc->fmtctx->format_whitelist);
+    qc->fmtctx-> codec_whitelist = av_strdup(s->codec_whitelist);
+    qc->fmtctx->format_whitelist = av_strdup(s->format_whitelist);
+
     ret = avformat_open_input(&qc->fmtctx, media_url, NULL, NULL);
     if (ret < 0)
         goto end;



More information about the ffmpeg-cvslog mailing list