r1247 - in /unstable/ffmpeg/debian: ./ changelog strip.sh

[siretart at users.alioth.debian.org]

Author: siretart
Date: Fri Jun  6 15:53:23 2008
New Revision: 1247

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1247
Log:
* debian/strip.sh: no need to remove the glue code for x264 and xvid.
  However, since that code is not built in debian anyway, the orig.tar.gz
  was not rebuilt with this change.

Modified:
    unstable/ffmpeg/debian/   (props changed)
    unstable/ffmpeg/debian/changelog
    unstable/ffmpeg/debian/strip.sh

Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------
--- bzr:ancestry:v3-single1-dW5zdGFibGUvZmZtcGVnL2RlYmlhbg.. (added)
+++ bzr:ancestry:v3-single1-dW5zdGFibGUvZmZtcGVnL2RlYmlhbg.. Fri Jun  6 15:53:23 2008
@@ -1,0 +1,1 @@
+siretart at tauware.de-20080606155302-8gcwcbgeck7qnv5k

Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------
--- bzr:revision-id:v3-single1-dW5zdGFibGUvZmZtcGVnL2RlYmlhbg.. (original)
+++ bzr:revision-id:v3-single1-dW5zdGFibGUvZmZtcGVnL2RlYmlhbg.. Fri Jun  6 15:53:23 2008
@@ -12,3 +12,4 @@
 36 siretart at tauware.de-20080604072648-b9lic30wsqate9yr
 37 siretart at tauware.de-20080604072935-wpiy49wwnqeq80zu
 38 siretart at tauware.de-20080606155027-qustr96yjphr850a
+39 siretart at tauware.de-20080606155320-sratr392q859ze2s

Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------
--- bzr:revision-info (original)
+++ bzr:revision-info Fri Jun  6 15:53:23 2008
@@ -1,4 +1,4 @@
-timestamp: 2008-06-06 17:50:27.871999979 +0200
+timestamp: 2008-06-06 17:53:20.321000099 +0200
 committer: Reinhard Tartler <siretart at tauware.de>
 properties: 
 	branch-nick: unstable

Modified: unstable/ffmpeg/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/changelog?rev=1247&op=diff
==============================================================================
--- unstable/ffmpeg/debian/changelog (original)
+++ unstable/ffmpeg/debian/changelog Fri Jun  6 15:53:23 2008
@@ -1,8 +1,11 @@
 ffmpeg-free (0.svn20080206-9) unstable; urgency=low
 
   * cleanup 010_proper_rpath.diff: remove spurious linker search paths.
-
- -- Reinhard Tartler <siretart at tauware.de>  Fri, 06 Jun 2008 17:48:02 +0200
+  * debian/strip.sh: no need to remove the glue code for x264 and xvid.
+    However, since that code is not built in debian anyway, the orig.tar.gz
+    was not rebuilt with this change.
+
+ -- Reinhard Tartler <siretart at tauware.de>  Fri, 06 Jun 2008 17:52:53 +0200
 
 ffmpeg-free (0.svn20080206-8) unstable; urgency=low
 

Modified: unstable/ffmpeg/debian/strip.sh
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/strip.sh?rev=1247&op=diff
==============================================================================
--- unstable/ffmpeg/debian/strip.sh (original)
+++ unstable/ffmpeg/debian/strip.sh Fri Jun  6 15:53:23 2008
@@ -1,6 +1,6 @@
 
 # strip/clean the code from potentially dangerous patented code
-for codec in 'h26.*' mpeg2video mpeg4 'msmpeg4.*' x264 xvid; do
+for codec in 'h26.*' mpeg2video mpeg4 'msmpeg4.*'; do
     F=libavcodec/allcodecs.c
     sed -i "/REGISTER_ENCODER.*\\<$codec\\>/d" $F
     sed -i "s/REGISTER_ENCDEC\\(.*\\<$codec\\>\\)/REGISTER_DECODER\\1/" $F