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

[刘歧]

> 在 2017年11月8日，18:02，Dixit, Vishwanath <vdixit at akamai.com> 写道：
> 
> I have added the copyright statement as per our legal team requirements. I have updated the patches again. Please consider the patches in this mail attachment as latest. Sorry for any inconvenience.
> 
> Regards,
> Vishwanath
> 
> <0001-avformat-hlsenc-creation-of-hls-variant-streams-in-a.patch><0002-avformat-hlsenc-creation-of-hls-master-playlist-file.patch><0003-tests-fate-addition-of-test-case-for-hls-variant-str.patch>_______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel


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$


Thanks