[FFmpeg-cvslog] avformat/dashdec: Add a re-entrance check point after an interrupt operation

Colin NG git at videolan.org
Wed Aug 29 11:37:42 EEST 2018


ffmpeg | branch: master | Colin NG <colin_ng at hotmail.com> | Wed Aug 29 16:28:03 2018 +0800| [b205635fbc0893b092caabd9edc047d16e44da7e] | committer: Steven Liu

avformat/dashdec: Add a re-entrance check point after an interrupt operation

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

 libavformat/dashdec.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c
index 85fbe6aacc..0435f25412 100644
--- a/libavformat/dashdec.c
+++ b/libavformat/dashdec.c
@@ -1777,6 +1777,12 @@ static int reopen_demux_for_component(AVFormatContext *s, struct representation
     if (pls->ctx) {
         close_demux_for_component(pls);
     }
+
+    if (ff_check_interrupt(&s->interrupt_callback)) {
+        ret = AVERROR_EXIT;
+        goto fail;
+    }
+
     if (!(pls->ctx = avformat_alloc_context())) {
         ret = AVERROR(ENOMEM);
         goto fail;



More information about the ffmpeg-cvslog mailing list