From 0ea721f7ce81357bc4ec6eea609cd50482c3d15b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Sat, 2 Dec 2006 01:19:48 +0000 Subject: Start working on a branch where FFmpeg is not copied, patched and carved to be built with automake but instead imported inline and built using its own build system. This is an import of a slightly modified FFmpeg current tree. xine-lib builds, install and run fine with it, but there are of course plenty of things that needs to be fixed before it can even be considered for a 1.2.x series. Work will continue in the next days of course. CVS patchset: 8397 CVS date: 2006/12/02 01:19:48 --- contrib/ffmpeg/clean-diff | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100755 contrib/ffmpeg/clean-diff (limited to 'contrib/ffmpeg/clean-diff') diff --git a/contrib/ffmpeg/clean-diff b/contrib/ffmpeg/clean-diff new file mode 100755 index 000000000..98e26a79f --- /dev/null +++ b/contrib/ffmpeg/clean-diff @@ -0,0 +1,11 @@ +#!/bin/sh +sed '/^+[^+]/!s/ /TaBBaT/g' |\ + expand -t `seq -s , 9 8 200` |\ + sed 's/TaBBaT/ /g' |\ + sed '/^+[^+]/s/ * $//' |\ + tr -d '\015' |\ + tr '\n' '°' |\ + sed 's/\(@@[^@]*@@°[^@]*\)/\n\1/g' |\ + egrep -v '@@[^@]*@@°(( [^°]*°)|([+-][[:space:]]*°)|(-[[:space:]]*([^°]*)°\+[[:space:]]*\5°))*$' |\ + tr -d '\n' |\ + tr '°' '\n' -- cgit v1.2.3