2017.01.03. 12:48 keltezéssel, Steven Liu írta:
2017-01-03 19:41 GMT+08:00 Bodecs Bela <bode...@vivanet.hu>:
2017.01.03. 11:42 keltezéssel, Moritz Barsnick írta:
On Tue, Jan 03, 2017 at 09:38:18 +0100, Bodecs Bela wrote:
doc/muxers.texi | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
You should probably squash this with the other patch, into one commit.
-Makes it possible to use segment indexes as %%d besides date/time values
when use_localtime is on.
+Makes it possible to use segment indexes as %%d in hls_segment_filename
expression besides date/time values when use_localtime is on. To get fixed
width numbers with trailing zeroes, %%0xd format is available where x is
the required width.
You could break these lines (texinfo formatting will handle the real
representation later), but I'm not sure it's totally necessary.
+@example
+./ffmpeg -loglevel info -y -f lavfi -i color=c=red:size=640x480:r=25 \
+ -f lavfi -i sine=f=440:b=4:r=44100 -c:v mpeg2video -g 25 -acodec aac
-cutoff 20000 -ac 2 -ar 44100 -ab 192k \
+ -f hls -hls_time 3 -hls_list_size 5 \
a) replace ./ffmpeg with ffmpeg (as most users would expect to use it),
b) please use simpler syntax for the stuff not related to what you are
trying to document; i.e.: ffmpeg -i input.mov -f hls -hls_time 3
-hls_list_size 5 [...]
+This will produce segments like this:
+@file{segment_20170102194334_0003_00122200_0000003000000.ts},
@file{segment_20170102194334_0004_00120072_0000003000000.ts} etc.
I have made the suggested modifications.
The rest seems fine to me!
Moritz
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
make to commit into one commit,
like this:
doc/muxers.texi | 19 ++++++++++++++++++-
libavformat/hlsenc.c | 180
++++++++++++++++++++++++++++++++++++++++++++++++---
in one commit. make one patch.
I have technical difficulties to merge them into one commit. I am not a
git expert.
This muxers.texi patch is based on my earlier accepted, but yet not
applied doc patch on this same file.
I created the related code patch in a different local git branch. Now I
tried to merge the two local branches into one
but a terrible result occured when I created a common patch file.
Is it a problem to remain two seperate patches?
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
