diff mbox

[FFmpeg-devel,1/1] flv demuxer supports live rtmp inputs but there is no any info about it in the docs

Message ID 0795306a-e5e9-a565-ff00-35f573686ace@vivanet.hu
State New
Headers show

Commit Message

Bodecs Bela Dec. 23, 2016, 11:36 p.m. UTC

Comments

Michael Niedermayer Dec. 26, 2016, 5:29 p.m. UTC | #1 
On Sat, Dec 24, 2016 at 12:36:55AM +0100, Bodecs Bela wrote:
> 

>  demuxers.texi |   10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
> b790ac3bc57d3aa83424fe91c8515fac4f5d7402  0001-flv-demuxer-supports-live-rtmp-inputs-but-there-is-n.patch
> From af75a5bbfe9f37672478b6a67f8bcfe32b7b997f Mon Sep 17 00:00:00 2001
> From: Bela Bodecs <bodecsb@vivanet.hu>
> Date: Sat, 24 Dec 2016 00:21:23 +0100
> Subject: [PATCH 1/1] flv demuxer supports live rtmp inputs but there is no any
>  info about it in the docs.

applied

thx

[...]
diff mbox

Patch

From af75a5bbfe9f37672478b6a67f8bcfe32b7b997f Mon Sep 17 00:00:00 2001
From: Bela Bodecs <bodecsb@vivanet.hu>
Date: Sat, 24 Dec 2016 00:21:23 +0100
Subject: [PATCH 1/1] flv demuxer supports live rtmp inputs but there is no any
 info about it in the docs.

Signed-off-by: Bela Bodecs <bodecsb@vivanet.hu>
---
 doc/demuxers.texi | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/doc/demuxers.texi b/doc/demuxers.texi
index 2934a1c..c12c07e 100644
--- a/doc/demuxers.texi
+++ b/doc/demuxers.texi
@@ -243,11 +243,17 @@  file subdir/file-2.wav
 @end example
 @end itemize
 
-@section flv
+@section flv, live_flv
 
 Adobe Flash Video Format demuxer.
 
-This demuxer is used to demux FLV files and RTMP network streams.
+This demuxer is used to demux FLV files and RTMP network streams. In case of live network streams, if you force format, you may use live_flv option instead of flv to survive timestamp discontinuities.
+
+@example
+ffmpeg -f flv -i myfile.flv ...
+ffmpeg -f live_flv -i rtmp://<any.server>/anything/key ....
+@end example
+
 
 @table @option
 @item -flv_metadata @var{bool}
-- 
2.5.3.windows.1