[FFmpeg-devel] [PATCH] avformat/hlsenc: creation of hls variant streams with master playlist in a single hlsenc instance

Dixit, Vishwanath vdixit at akamai.com
Tue Nov 14 08:42:20 EET 2017

>On 11/13/17, 3:28 PM, "刘歧" <lq at chinaffmpeg.org> wrote:
>root at localhost:~/ffmpeg# patch -p1 < ~/0001-avformat-hlsenc-creation-of-hls-variant-streams-in-a.patch
>    patching file doc/muxers.texi
>    patching file libavformat/hlsenc.c
>    Hunk #47 FAILED at 1622.
>    1 out of 58 hunks FAILED -- saving rejects to file libavformat/hlsenc.c.rej
>    patching file libavformat/version.h
>    Hunk #1 FAILED at 33.
>    1 out of 1 hunk FAILED -- saving rejects to file libavformat/version.h.rej
>    liuqideMBP:ffmpeg liuqi$ git reset --hard
>    HEAD is now at 43171a2a73 Fix missing used attribute for inline assembly variables
>    liuqideMBP:ffmpeg liuqi$ git am ~/0001-avformat-hlsenc-creation-of-hls-variant-streams-in-a.patch
>    fatal: previous rebase directory .git/rebase-apply still exists but mbox given.
>    liuqideMBP:ffmpeg liuqi$
 I have re-based the patches. Please find the updated patches in the attachment.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-avformat-hlsenc-creation-of-hls-variant-streams-in-a.patch
Type: application/octet-stream
Size: 71599 bytes
Desc: 0001-avformat-hlsenc-creation-of-hls-variant-streams-in-a.patch
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20171114/a7d8b218/attachment.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002-avformat-hlsenc-creation-of-hls-master-playlist-file.patch
Type: application/octet-stream
Size: 12303 bytes
Desc: 0002-avformat-hlsenc-creation-of-hls-master-playlist-file.patch
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20171114/a7d8b218/attachment-0001.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0003-tests-fate-addition-of-test-case-for-hls-variant-str.patch
Type: application/octet-stream
Size: 93517 bytes
Desc: 0003-tests-fate-addition-of-test-case-for-hls-variant-str.patch
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20171114/a7d8b218/attachment-0002.obj>

More information about the ffmpeg-devel mailing list