On Mon, Oct 10, 2016 at 04:31:29AM -0700, Thomas Turner wrote: > code coverage for av_fifo_grow(...), av_fifo_generic_peek(...) > --- > libavutil/Makefile | 1 + > libavutil/tests/fifo2.c | 3 ++- > tests/fate/libavutil.mak | 4 ++++ > tests/ref/fate/fifo2 | 3 +++ > 4 files changed, 10 insertions(+), 1 deletion(-) > create mode 100644 tests/ref/fate/fifo2
this patch does not apply cleanly to git master Applying: Selftest coverage for libavutil/fifo.c .git/rebase-apply/patch:30: trailing whitespace. if (av_fifo_generic_write(fifo, (void*)elem, av_fifo_space(fifo), NULL) != .git/rebase-apply/patch:56: trailing whitespace. fifo->buffer: 0, 2, 4, 6, 8, 10, 12, fatal: sha1 information is lacking or useless (libavutil/tests/fifo2.c). error: could not build fake ancestor Patch failed at 0001 Selftest coverage for libavutil/fifo.c The copy of the patch that failed is found in: .git/rebase-apply/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". > > diff --git a/libavutil/Makefile b/libavutil/Makefile > index 0fa90fe..a34171e 100644 > --- a/libavutil/Makefile > +++ b/libavutil/Makefile > @@ -195,6 +195,7 @@ TESTPROGS = adler32 > \ > eval \ > file \ > fifo \ > + fifo2 \ > float_dsp \ > hash \ > hmac \ > diff --git a/libavutil/tests/fifo2.c b/libavutil/tests/fifo2.c > index 923feee..e40b8cd 100644 > --- a/libavutil/tests/fifo2.c > +++ b/libavutil/tests/fifo2.c theres no libavutil/tests/fifo2.c in git master [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Why not whip the teacher when the pupil misbehaves? -- Diogenes of Sinope
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel