[SCM] ffmpeg/ubuntu.extra: force upgrade of the mplayer package

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu.extra branch:
commit 1130d4323045bd782baad369417dce368970b9a7
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Nov 19 12:16:27 2010 +0100

    force upgrade of the mplayer package

diff --git a/debian/control b/debian/control
index b444e31..1039bd4 100644
--- a/debian/control
+++ b/debian/control
@@ -121,7 +121,7 @@ Depends: ${shlibs:Depends},
  ${misc:Depends}
 Conflicts: libavformat52
 Replaces: libavformat52
-Breaks: libavcodec51
+Breaks: libavcodec51, mplayer (<< 2:1.0~rc4~)
 Description: ffmpeg file format library
  This is the demuxer library from the ffmpeg project. It supports most
  existing file formats (AVI, MPEG, OGG, Matroska, ASF...).

-- 
FFmpeg packaging