[FFmpeg-cvslog] lavf/concatdec: do not transfer custom IO flag

Clément Bœsch git at videolan.org
Mon May 22 18:50:33 EEST 2017


ffmpeg | branch: master | Clément Bœsch <cboesch at gopro.com> | Mon May 22 16:55:28 2017 +0200| [0dcac9c3f0f8f32009098edb704fac4b08bac951] | committer: Clément Bœsch

lavf/concatdec: do not transfer custom IO flag

If the source is using a custom IO, setting this flag causes heavy leaks
since the segments will not have their avio context closed.

Regression since f5da453b068f55d335ca403d2e2b4dd2ac3d4331.

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

 libavformat/concatdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c
index 73f8a63a2b..e57e5ce0ec 100644
--- a/libavformat/concatdec.c
+++ b/libavformat/concatdec.c
@@ -324,7 +324,7 @@ static int open_file(AVFormatContext *avf, unsigned fileno)
     if (!cat->avf)
         return AVERROR(ENOMEM);
 
-    cat->avf->flags |= avf->flags;
+    cat->avf->flags |= avf->flags & ~AVFMT_FLAG_CUSTOM_IO;
     cat->avf->interrupt_callback = avf->interrupt_callback;
 
     if ((ret = ff_copy_whiteblacklists(cat->avf, avf)) < 0)



More information about the ffmpeg-cvslog mailing list