From d33a091cb382d39146aa1ee7b8364a5d497e715f Mon Sep 17 00:00:00 2001
From: Rick van der Zwet <info@rickvanderzwet.nl>
Date: Sat, 3 Mar 2012 20:45:45 +0100
Subject: ffm options should also set discard automatically.

commit 13f6917ca91dfdc0fd785235b2dae891a9604859 handles discards automatically,
but the ffm discard options are not fully parsed. Causing the input streams not
to be used, so no stream towards the ffserver after the initial probing.

Signed-off-by: Rick van der Zwet <info@rickvanderzwet.nl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
 ffmpeg.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'ffmpeg.c')

diff --git a/ffmpeg.c b/ffmpeg.c
index c43192d8f9..7afec4ce0d 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -4310,6 +4310,7 @@ static void opt_output_file(void *optctx, const char *filename)
                     ost->sync_ist= ist;
                     ost->source_index= i;
                     ist->discard = 0;
+                    ist->st->discard = AVDISCARD_NONE;
                     break;
                 }
             }
-- 
cgit v1.2.3