[SCM] ffmpeg/master: Build against libx264. Closes: #418228, #440681

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c955484062cc605e8534dcfff60e9ad1ac9e4b8b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jul 26 12:07:38 2011 +0200

    Build against libx264. Closes: #418228, #440681

diff --git a/debian/control b/debian/control
index 1430b6b..d246f77 100644
--- a/debian/control
+++ b/debian/control
@@ -35,6 +35,7 @@ Build-Depends: debhelper (>= 7),
  libvorbis-dev,
  libvpx-dev,
  libx11-dev,
+ libx264-dev,
  libxext-dev,
  libxfixes-dev,
  libxvmc-dev,

-- 
Libav/FFmpeg packaging