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?
commit 1631b1e5e871fa0d9a49fbcfdee0d27d034af79b
Author: Timo Rothenpieler <t...@rothenpieler.org>
Date: Fri Jan 16 01:02:38 2015 +0100
avcodec/nvenc: Fix b-frame parameter handling
--phil
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
