Welcome to Doom9's Forum, THE in-place to be for everyone interested in DVD conversion.

Before you start posting please read the forum rules. By posting to this forum you agree to abide by the rules.

 

Go Back   Doom9's Forum > Programming and Hacking > Development

Reply
 
Thread Tools Search this Thread Display Modes
Old 7th March 2010, 20:57   #1  |  Link
bnshrdr
Registered User
 
Join Date: Jun 2009
Location: Indianapolis, IN
Posts: 103
Can anyone make a patch for me?

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

Thanks.
bnshrdr is offline   Reply With Quote
Old 7th March 2010, 21:03   #2  |  Link
Dark Shikari
x264 developer
 
Dark Shikari's Avatar
 
Join Date: Sep 2005
Posts: 8,688
1. Use svn diff.

2. You seem to have a problem with line endings. Set your editor to use proper UNIX line endings.
Dark Shikari is offline   Reply With Quote
Old 7th March 2010, 21:31   #3  |  Link
bnshrdr
Registered User
 
Join Date: Jun 2009
Location: Indianapolis, IN
Posts: 103
That was it. I hadn't set my EOL setting to UNIX. Thanks!
bnshrdr is offline   Reply With Quote
Reply

Thread Tools Search this Thread
Search this Thread:

Advanced Search
Display Modes

Posting Rules
You may not post new threads
You may not post replies
You may not post attachments
You may not edit your posts

BB code is On
Smilies are On
[IMG] code is On
HTML code is Off

Forum Jump


All times are GMT +1. The time now is 20:21.


Powered by vBulletin® Version 3.8.11
Copyright ©2000 - 2020, vBulletin Solutions Inc.