[SCM] mplayer/master.experimental: enable XVID, MP3 and X264 encoders

[siretart at users.alioth.debian.org]

The following commit has been merged in the master.experimental branch:
commit 358f7049be7e23e0d70a7b3cd5cb417a6780eb6c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Aug 17 18:02:54 2011 +0200

    enable XVID, MP3 and X264 encoders

diff --git a/debian/control b/debian/control
index b9e351d..79093e6 100644
--- a/debian/control
+++ b/debian/control
@@ -42,6 +42,7 @@ Build-Depends:
  liblircclient-dev,
  liblivemedia-dev,
  liblzo2-dev,
+ libmp3lame-dev,
  libmpcdec-dev,
  libncurses5-dev,
  libopenal-dev,
@@ -59,9 +60,11 @@ Build-Depends:
  libvorbis-dev,
  libvorbisidec-dev,
  libx11-dev,
+ libx264-dev,
  libxext-dev,
  libxinerama-dev,
  libxv-dev,
+ libxvidcore-dev,
  libxvmc-dev,
  libxxf86dga-dev,
  libxxf86vm-dev,
diff --git a/debian/copyright b/debian/copyright
index 644e9cf..9aecc54 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -938,7 +938,7 @@ License: ISC
  Permission to use, copy, modify, and/or distribute this software for any
  purpose with or without fee is hereby granted, provided that the above
  copyright notice and this permission notice appear in all copies.
- . 
+ .
  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

-- 
mplayer packaging