> 在 2019年6月19日,下午6:00,Bodecs Bela <bode...@vivanet.hu> 写道: > > > 2019.06.19. 11:37 keltezéssel, Michael Niedermayer írta: >> On Tue, Jun 18, 2019 at 11:09:12PM +0200, Bodecs Bela wrote: >>> Dear All, >>> >>> When multiple variant streams are specified by var_stream_map option, %v >>> placeholder in various names ensures that each variant has its unique >>> names. Currently %v is substituted by its variant index value (0, 1, 2 >>> etc.). In some use cases it would be handy to specify names for variants >>> instead of numerical indexes. This patch makes it possible to use names >>> instead of default indexes. In var_stream_map option each or some of the >>> variant streams may use an optional name attributum (e.g. >>> -var_stream_map "v:0,a:0,name:sd v:1,a:1,name:720p") If a name is >>> specified for a variant, then this name value will be used as >>> substitution value of %v instead of the default index value. >>> >>> >>> example: >>> ffmpeg -re -i in.ts -b:v:0 1000k -b:v:1 256k -b:a:0 64k -b:a:1 32k \ >>> -map 0:v:0 -map 0:a:0 -map 0:v:1 -map 0:a:1 -f hls -var_stream_map >>> "v:0,a:0,name:my_hd v:1,a:1,name:mysd" \ >>> http://example.com/live/out_%v.m3u8 >>> >>> This example creates two hls variant streams, the two output media playlist >>> with file names out_my_hd.m3u8 and out_mysd.m3u8 will be created. >>> >>> Please review this patch. >>> >>> best regards, >> maybe i made a mistake but this seems not to apply >> >> Applying: avformat/hlsenc: enhanced %v handling with variant names >> error: sha1 information is lacking or useless (libavformat/hlsenc.c). >> error: could not build fake ancestor >> Patch failed at 0001 avformat/hlsenc: enhanced %v handling with variant names >> hint: Use 'git am --show-current-patch' to see the failed patch >> When you have resolved this problem, run "git am --continue". >> If you prefer to skip this patch, run "git am --skip" instead. >> To restore the original branch and stop patching, run "git am --abort". >> >> [...] >> >> > I think it relates to the fact - as I mentioned my other post - that I > created two related patches and I send them into the list as unrelated > patches. > > I will wait for my earlier patch to be applied and then I reissue this patch > again.
I have pushed the first patch, and this patch cannot be merged: muhanmoeMacBook:ffmpeg StevenLiu$ git am ~/Downloads/0001-avformat-hlsenc-enhanced-v-handling-with-variant-nam.patch fatal: previous rebase directory .git/rebase-apply still exists but mbox given. muhanmoeMacBook:ffmpeg StevenLiu$ patch -p1 < ~/Downloads/0001-avformat-hlsenc-enhanced-v-handling-with-variant-nam.patch (Stripping trailing CRs from patch.) patching file doc/muxers.texi (Stripping trailing CRs from patch.) patching file libavformat/hlsenc.c Hunk #8 FAILED at 2693. Hunk #9 FAILED at 2754. Hunk #10 FAILED at 2811. Hunk #11 FAILED at 2876. Hunk #12 succeeded at 2938 (offset 11 lines). 4 out of 12 hunks FAILED -- saving rejects to file libavformat/hlsenc.c.rej muhanmoeMacBook:ffmpeg StevenLiu$ > > best, > > bb > >> _______________________________________________ >> ffmpeg-devel mailing list >> ffmpeg-devel@ffmpeg.org >> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel >> >> To unsubscribe, visit link above, or email >> ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe". > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe". _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".