On Sat, Jan 24, 2015 at 10:11:21AM -0800, Philip Langdale wrote: > On Sat, 24 Jan 2015 13:02:01 +0100 > Michael Niedermayer <michae...@gmx.at> wrote: > > > On Fri, Jan 23, 2015 at 09:41:23PM -0800, Philip Langdale wrote: > > > Signed-off-by: Philip Langdale <phil...@overt.org> > > > --- > > > libavcodec/nvenc.c | 5 +++++ > > > 1 file changed, 5 insertions(+) > > > > Applying: nvenc: Propagate desired number of reference frames. > > fatal: sha1 information is lacking or useless (libavcodec/nvenc.c). > > Repository lacks necessary blobs to fall back on 3-way merge. > > Cannot fall back to three-way merge. > > Patch failed at 0001 nvenc: Propagate desired number of reference > > frames. When you have resolved this problem run "git am --resolved". > > If you would prefer to skip this patch, instead run "git am --skip". > > To restore the original branch and stop patching run "git am --abort". > > Yeah, I've got Timo's b-frame patch in my tree. Don't you want to apply > that?
Iam not sure if that would break intra only encoding, so i wont apply this before timo or someone else who knows the code says i should apply it [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Complexity theory is the science of finding the exact solution to an approximation. Benchmarking OTOH is finding an approximation of the exact
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
