[FFmpeg-devel] [PATCH] avformat/hlsenc: creation of hls variant streams with master playlist in a single hlsenc instance
Carl Eugen Hoyos
ceffmpeg at gmail.com
Wed Nov 15 01:13:51 EET 2017
2017-11-14 7:42 GMT+01:00 Dixit, Vishwanath <vdixit at akamai.com>:
>>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.
The first patch adds three warnings here (val has to be const),
the second adds an unused variable, please fix both issues.
(I wonder if the first patch could be simplified into "splitting
the struct" and "adding the new feature".)
More information about the ffmpeg-devel