aboutsummaryrefslogtreecommitdiff
path: root/lib/ffmpeg
diff options
context:
space:
mode:
authorFlyingRat <flyingrat@outlook.com>2013-04-19 22:08:58 +0200
committerFlyingRat <flyingrat@outlook.com>2013-04-19 22:08:58 +0200
commit1d26033f55c430bdc40f64dc201521216635b8f3 (patch)
treef935a165fbbcfaed21ac87d40b5c4a4a0aae0815 /lib/ffmpeg
parentc403dcf5d16fb4bbd9dd8cc6b3363181f9aa8d23 (diff)
[ffmpeg] updated and reformated ffmpeg/patches/README-patches
Diffstat (limited to 'lib/ffmpeg')
-rw-r--r--lib/ffmpeg/patches/README-patches19
1 files changed, 15 insertions, 4 deletions
diff --git a/lib/ffmpeg/patches/README-patches b/lib/ffmpeg/patches/README-patches
index 5f1db53098..1737930c25 100644
--- a/lib/ffmpeg/patches/README-patches
+++ b/lib/ffmpeg/patches/README-patches
@@ -1,7 +1,18 @@
-This directory contains XBMC custom patches that are refactored to fit the FFmpeg n1.2 rev e820e3a distribution.
+This directory contains XBMC custom patches that are refactored to fit the FFmpeg
+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.
+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.
-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.
+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 patch so that it clearly states that it is a change from upstream and which commit in ffmpeg repo it is).
+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 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.