[FFmpeg-cvslog] ffm options should also set discard automatically.

Rick van der Zwet git at videolan.org
Sun Mar 4 00:32:59 CET 2012


ffmpeg | branch: master | Rick van der Zwet <info at rickvanderzwet.nl> | Sat Mar  3 20:45:45 2012 +0100| [d33a091cb382d39146aa1ee7b8364a5d497e715f] | committer: Michael Niedermayer

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 at rickvanderzwet.nl>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 ffmpeg.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index c43192d..7afec4c 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;
                 }
             }



More information about the ffmpeg-cvslog mailing list