Skip to content

Commit

Permalink
README: fixed spelling errors and added some clarifications.
Browse files Browse the repository at this point in the history
  • Loading branch information
FlyingRat committed May 2, 2013
1 parent 20a5fbf commit f0bb14a
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions lib/ffmpeg/patches/README-patches
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ n1.2 rev e820e3a distribution.

All patches in the patches folder are already applied to the ffmpeg code base and
are only kept here for tracking history. Some of patches are ours and some are
backports from ffmpegs upstream. Patches that has become obsolete since ffmpeg
n0.10.2 are moved to obsolete-patches, also for tracking reasons.
backports from ffmpegs upstream. Patches that have become obsolete since ffmpeg
n0.10.2 are moved to the directory obsolete-patches, also for tracking reasons.

Normally you can have a look into that patchfile itself to see if its a backport
or not (we normally leave the original commit message and the committer in there).
You can also use "git log lib/ffmpeg/patches" to show the history where the patch
file came from.

Whenever you need to patch a new ffmpeg versions you apply the patch and then add
the git diff to the patches folder in the next commit (if its a backport - adapt
the git diff to the patches folder in the next commit. If its a backport - adapt
the patch so that it clearly states that it is a change from upstream and which
commit in ffmpeg repo it is). Please use an uniq patch number this check that
the number doesn't conflict with others in obsolete patches.
commit in ffmpeg repo it is. Please pick an uniq patch number that doesn't
conflict with others in both the directories /patches and /patches/obsolete-patches

0 comments on commit f0bb14a

Please sign in to comment.