summaryrefslogtreecommitdiffstats
path: root/media/ffvpx/README_MCP
diff options
context:
space:
mode:
authortrav90 <travawine@protonmail.ch>2018-04-26 16:56:17 -0500
committertrav90 <travawine@protonmail.ch>2018-04-26 16:56:17 -0500
commitb2f89250be2ae4ff4dc509209d996f515d737881 (patch)
tree144ef1b805974dfa91b70f5384b395022a8e9fb7 /media/ffvpx/README_MCP
parent622f0610e1021335060988497a8eb6bc42630909 (diff)
downloadUXP-b2f89250be2ae4ff4dc509209d996f515d737881.tar
UXP-b2f89250be2ae4ff4dc509209d996f515d737881.tar.gz
UXP-b2f89250be2ae4ff4dc509209d996f515d737881.tar.lz
UXP-b2f89250be2ae4ff4dc509209d996f515d737881.tar.xz
UXP-b2f89250be2ae4ff4dc509209d996f515d737881.zip
[ffvpx] Update resync documentation
Diffstat (limited to 'media/ffvpx/README_MCP')
-rw-r--r--media/ffvpx/README_MCP10
1 files changed, 8 insertions, 2 deletions
diff --git a/media/ffvpx/README_MCP b/media/ffvpx/README_MCP
index de1fdc264..4555e08da 100644
--- a/media/ffvpx/README_MCP
+++ b/media/ffvpx/README_MCP
@@ -37,6 +37,12 @@ $ grep -E ".*_(INDEV|OUTDEV|DECODER|ENCODER|DEMUXER|MUXER|PARSER|FILTER|HWACCEL|
All new decoders/muxers/encoders/... should be added in the list of dummy functions found in libavcodec/dummy_funcs.c
otherwise linkage will fail on Windows. On other platforms they are optimised out and aren't necessary.
-
-To update the source tree, the files listed in FILES should typically be able to be copied as-is from ffmpeg tree.
+The GNU comm utility is a useful tool to compare and extract only the changes.
+
+To update the source tree, perform a diff on the files listed in FILES.
+The diffs should typically apply to the ffvpx tree.
+e.g. something like this would do:
+Run in the ffmpeg original tree:
+$ for i in `cat $PATH_CENTRAL/media/ffvpx/FILES`; do diff $REV_LASTSYNC HEAD >> patch.diff; done
+Then apply patch.diff on the ffvpx tree.
Compilation will reveal if any files are missing.