On 4/13/2016 7:45 AM, Michael Niedermayer wrote: > On Wed, Apr 13, 2016 at 02:08:21AM -0300, James Almer wrote: >> Signed-off-by: James Almer <jamr...@gmail.com> >> --- >> This change is not dependent on the framehash patches. I'm not going to >> convert framecrc into a framehash alias for now. >> The updated ref files should be the same as in Michael's original patch. >> This however also includes a couple tests added since the original. > > seems not to apply cleanly (neither with now without the other patches) > > Applying: avformat/framecrc: enable new output > fatal: sha1 information is lacking or useless > (libavformat/uncodedframecrcenc.c). > Repository lacks necessary blobs to fall back on 3-way merge. > Cannot fall back to three-way merge. > Patch failed at 0001 avformat/framecrc: enable new output > 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". > > so i cant test but it LGTM > > thx
Updated and pushed. _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
