summaryrefslogtreecommitdiff
path: root/libavformat/concatdec.c
diff options
context:
space:
mode:
authorClément Bœsch <cboesch@gopro.com>2017-05-22 16:55:28 +0200
committerClément Bœsch <cboesch@gopro.com>2017-05-22 16:55:30 +0200
commit0dcac9c3f0f8f32009098edb704fac4b08bac951 (patch)
treee83fbf11cb4c85376ef324efb669167e02d3076b /libavformat/concatdec.c
parent9fb293cfd8b758b98f1f535a2867c7bf3a324af6 (diff)
downloadffmpeg-0dcac9c3f0f8f32009098edb704fac4b08bac951.tar.gz
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.
Diffstat (limited to 'libavformat/concatdec.c')
-rw-r--r--libavformat/concatdec.c2
1 files changed, 1 insertions, 1 deletions
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)