> -----Original Message----- > From: Alexander Kravchenko [mailto:akravchenko...@gmail.com] > Sent: Sunday, April 15, 2018 12:02 AM > To: 'FFmpeg development discussions and patches' <ffmpeg-devel@ffmpeg.org> > Subject: RE: [FFmpeg-devel] [PATCH] lavc/amfenc: DXVA2 textures support > implementation by AMF encoder > > > > > -----Original Message----- > > From: ffmpeg-devel [mailto:ffmpeg-devel-boun...@ffmpeg.org] On Behalf > > Of Mark Thompson > > Sent: Saturday, April 14, 2018 7:15 PM > > To: ffmpeg-devel@ffmpeg.org > > Subject: Re: [FFmpeg-devel] [PATCH] lavc/amfenc: DXVA2 textures > > support implementation by AMF encoder > > > > > > I've sent a new set containing this patch as 3 and 4 (I split out the > > format check part, since that doesn't have anything to do with DXVA2), > > which hopefully makes the initialisation and surface mapping > setup cleaner. Would you like to look at that and comment? > > Quite a bit of stuff got moved around in the merge. > > > > > Hi Mark, > I briefly read the patches, they look good But I tried to apply them locally > The first one failed > 1) I cloned ffmpeg > 2) pasted patch text to file p1.patch > 3) git apply p1.patch > > error: patch failed: libavcodec/amfenc.c:152 > error: libavcodec/amfenc.c: patch does not apply > > it look like patch expexts "amf_load_library(AVCodecContext *avctx)" at line > 152 @@ -152,10 +152,30 @@ static int > amf_load_library(AVCodecContext *avctx) > > In github > https://github.com/FFmpeg/FFmpeg/blob/master/libavcodec/amfenc.c > it is on line 155 > > did I miss something? > > Thanks, > Alexander >
I managed to apply patch, patch was broken by Far Manager Editor. Pasting patch text to nano solved the applying problem. _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
