[SCM] ffmpeg/ubuntu: remove unnecessary conflicts in package libswscale2

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 782772a39202e0652288457c0df7b3bc29d82285
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Aug 26 11:11:57 2011 +0200

    remove unnecessary conflicts in package libswscale2

diff --git a/debian/control b/debian/control
index b7c11a6..3b9661d 100644
--- a/debian/control
+++ b/debian/control
@@ -174,8 +174,6 @@ Package: libswscale2
 Architecture: any
 Depends: ${shlibs:Depends},
  ${misc:Depends}
-Conflicts: libswscale-extra-1 (>> 4:0.7~)
-Replaces: libswscale-extra-1 (>> 4:0.7~)
 Description: Libav video scaling library
  This is the video software scaling library from Libav.
 

-- 
Libav/FFmpeg packaging