> 在 2017年11月14日，14:42，Dixit, Vishwanath <vdi...@akamai.com> 写道： > > > >> On 11/13/17, 3:28 PM, "刘歧" <l...@chinaffmpeg.org> wrote: >> root@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. > > <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@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
make fate failed: ../configure --enable-gpl --enable-memory-poisoning --enable-avresample --cc='ccache arm-linux-gnueabi-gcc' --target-exec='qemu-arm -L /usr/arm-linux-gnueabi/' --arch=armv5te --cpu=armv5te --enable-cross-compile --target-os=linux --cross-prefix=/usr/arm-linux-gnueabi/bin/ root@localhost:~/ffmpeg/xxx# make fate-filter-hls-vs-with-master GEN tests/data/hls-vs-with-master.m3u8 make: *** [tests/data/hls-vs-with-master.m3u8] Error 1 root@localhost:~/ffmpeg/xxx# _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
