OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
856e1ea
)
avformat/tee: Copy interrupt callback and flags to slave
author
Jan Sebechlebsky
<sebechlebskyjan@gmail.com>
Fri, 12 Aug 2016 20:30:03 +0000
(22:30 +0200)
committer
Jan Sebechlebsky
<sebechlebskyjan@gmail.com>
Thu, 29 Sep 2016 15:17:26 +0000
(17:17 +0200)
Copy interrupt callback to slave format context to allow
user to interrupt IO. Copy format flags as well.
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
libavformat/tee.c
patch
|
blob
|
history
diff --git
a/libavformat/tee.c
b/libavformat/tee.c
index
518af4a
..
d59ad4d
100644
(file)
--- 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) {