[FFmpeg-cvslog] avformat/tee: Copy interrupt callback and flags to slave

Jan Sebechlebsky git at videolan.org
Thu Sep 29 18:18:50 EEST 2016


ffmpeg | branch: master | Jan Sebechlebsky <sebechlebskyjan at gmail.com> | Fri Aug 12 22:30:03 2016 +0200| [81bab1074ff9071ea0c5ed91ae10e9e1b6e9ad30] | committer: Jan Sebechlebsky

avformat/tee: Copy interrupt callback and flags to slave

Copy interrupt callback to slave format context to allow
user to interrupt IO. Copy format flags as well.

Signed-off-by: Jan Sebechlebsky <sebechlebskyjan at gmail.com>

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

 libavformat/tee.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/tee.c b/libavformat/tee.c
index 518af4a..d59ad4d 100644
--- a/libavformat/tee.c
+++ b/libavformat/tee.c
@@ -161,6 +161,8 @@ static int open_slave(AVFormatContext *avf, char *slave, TeeSlave *tee_slave)
     avf2->opaque   = avf->opaque;
     avf2->io_open  = avf->io_open;
     avf2->io_close = avf->io_close;
+    avf2->interrupt_callback = avf->interrupt_callback;
+    avf2->flags = avf->flags;
 
     tee_slave->stream_map = av_calloc(avf->nb_streams, sizeof(*tee_slave->stream_map));
     if (!tee_slave->stream_map) {



More information about the ffmpeg-cvslog mailing list