[SCM] ffmpeg/master: prefer libtiff4 over libtiff5 for now

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b42c6bf10b6d890a232a25fd802ca8567eff63a0
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Sep 26 22:41:53 2011 +0200

    prefer libtiff4 over libtiff5 for now
    
    This is done to make the installation of build dependencies predictable

diff --git a/debian/control b/debian/control
index ed694c6..811652e 100644
--- a/debian/control
+++ b/debian/control
@@ -31,6 +31,7 @@ Build-Depends: debhelper (>= 8.1.3~),
  libsdl1.2-dev,
  libspeex-dev,
  libtheora-dev (>> 0.0.0.alpha4),
+ libtiff4-dev | libtiff-dev,
  libva-dev [!hurd-i386],
  libvdpau-dev,
  libvorbis-dev,

-- 
Libav/FFmpeg packaging