diff mbox

[FFmpeg-devel,1/2] avformat/tee: Copy interrupt callback and flags to slave

Message ID 1475102977-23260-1-git-send-email-sebechlebskyjan@gmail.com
State Accepted
Commit 81bab1074ff9071ea0c5ed91ae10e9e1b6e9ad30
Headers show

Commit Message

sebechlebskyjan@gmail.com Sept. 28, 2016, 10:49 p.m. UTC 
From: Jan Sebechlebsky <sebechlebskyjan@gmail.com>

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 | 2 ++
 1 file changed, 2 insertions(+)

Comments

Nicolas George Sept. 29, 2016, 7:03 a.m. UTC | #1 
L'octidi 8 vendémiaire, an CCXXV, sebechlebskyjan@gmail.com a écrit :
> From: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
> 
> 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 | 2 ++
>  1 file changed, 2 insertions(+)

LGTM, thanks.

Regards,
sebechlebskyjan@gmail.com Sept. 29, 2016, 3:21 p.m. UTC | #2 
On 09/29/2016 09:03 AM, Nicolas George wrote:

> L'octidi 8 vendémiaire, an CCXXV, sebechlebskyjan@gmail.com a écrit :
>> From: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
>>
>> 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 | 2 ++
>>   1 file changed, 2 insertions(+)
> LGTM, thanks.
>
> Regards,
>
Applied

Regards,
Jan
diff mbox

Patch

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) {