Can anyone make a patch for me?

[bnshrdr]

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. The patch from arrozcru's website is for a much earlier revision and won't work on the current revision of ffmpeg. Right now I just manually looked at the diff and made the 4 fixes, but using a patch is much easier

I thought it was as simple as this:
diff -urNp old updated > file.patch

But when I apply the patch with this:
patch -p0 < file.patch
I get the result:
(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

Which shows a successful patch on the second file, but a failed patch on the first.

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)-
ffmpeg_static_pthread_update.zip (http://www.mediafire.com/?um2qz1yntti)

Thanks.

[Dark Shikari]

1. Use svn diff.

2. You seem to have a problem with line endings. Set your editor to use proper UNIX line endings.

[bnshrdr]

That was it. I hadn't set my EOL setting to UNIX. Thanks!