I for the life of me cannot create a patch that will work. These two files are from the source of ffmpeg and have been updated by myself, and I just want to create a simple diff file that I can use in the future.
I thought it was as simple as this:
But when I apply the patch with this:
diff -urNp old updated > file.patch
I get the result:
patch -p0 < file.patch
Which shows a successful patch on the second file, but a failed patch on the first.
(Stripping trailing CRs from patch.)
patching file old/configure
Hunk #1 FAILED at 2555.
Hunk #2 FAILED at 2603.
2 out of 2 hunks FAILED -- saving rejects to file old/configure.rej
patching file old/libavcodec/allcodecs.c
If someone could be so kind to either create a diff for me or tell me what I could be doing wrong, I would be so grateful.
-Download (58.5 KB file)-