← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/xvidcap/jaunty-proposed

« back to all changes in this revision

Viewing changes to ffmpeg/tools/clean-diff

  • Committer: Bazaar Package Importer
  • Author(s): Lionel Le Folgoc, Andrew Starr-Bochicchio, Lionel Le Folgoc
  • Date: 2008-12-26 00:10:06 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20081226001006-2040ls9680bd1blt
Tags: 1.1.7-0.2ubuntu1
https://launchpad.net/bugs/298547
https://launchpad.net/bugs/311412
[ Andrew Starr-Bochicchio ]
* Merge from debian-multimedia (LP: #298547), Ubuntu Changes:
 - For ffmpeg-related build-deps, fix versionized dependencies
   as the ubuntu versioning is different than debian-multimedia's.

[ Lionel Le Folgoc ]
* LP: #311412 is fixed since the 1.1.7~rc1-0.1 revision.
* debian/patches/03_ffmpeg.diff: updated to fix FTBFS due to libswscale API
  change (cherry-pick from Gentoo #234383).

Show diffs side-by-side

added added

removed removed

Lines of Context:
ffmpeg/tools/clean-diff
 
1
#!/bin/sh
 
2
sed '/^+[^+]/!s/        /TaBBaT/g' |\
 
3
 expand -t `seq -s , 9 8 200` |\
 
4
 sed 's/TaBBaT/ /g' |\
 
5
 sed '/^+[^+]/s/ * $//' |\
 
6
 tr -d '\015' |\
 
7
 tr '\n' '�' |\
 
8
 sed 's/\(@@[^@]*@@�[^@]*\)/\n\1/g' |\
 
9
 egrep -v '@@[^@]*@@�(( [^�]*�)|([+-][[:space:]]*�)|(-[[:space:]]*([^�]*)�\+[[:space:]]*\5�))*$' |\
 
10
 tr -d '\n' |\
 
11
 tr '�' '\n'