[SCM] ffmpeg/master: Require 3.4 avcodec/avfilter when 3.4 avutil is in use

[jcowgill at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c66bfe99b6c703fdb312f908d4af6b35e4afd1cf
Author: James Cowgill <jcowgill at debian.org>
Date:   Sat Nov 25 10:43:32 2017 +0000

    Require 3.4 avcodec/avfilter when 3.4 avutil is in use
    
    In ffmpeg 3.4, avutil broke part of the float_dsp internal ABI. This
    causes segfaults when pre-3.4 avcodec/avfilter is used with 3.4 avutil
    or vice-versa.
    
    Fix this by requiring avcodec/avfilter to be upgraded in lock-step with
    avutil. avcodec/avfilter 3.4 already require avutil >= 3.4. Add some
    breaks to ensure upgrades the other way around.
    
    Closes: #882598

diff --git a/debian/control b/debian/control
index 5ec74a3..febcbf0 100644
--- a/debian/control
+++ b/debian/control
@@ -551,6 +551,11 @@ Pre-Depends:
 Depends:
  ${shlibs:Depends},
  ${misc:Depends}
+Breaks:
+ libavcodec57 (<< 7:3.4),
+ libavcodec-extra57 (<< 7:3.4),
+ libavfilter6 (<< 7:3.4),
+ libavfilter-extra6 (<< 7:3.4)
 Description: FFmpeg library with functions for simplifying programming - runtime files
  FFmpeg is the leading multimedia framework, able to decode, encode, transcode,
  mux, demux, stream, filter and play pretty much anything that humans and

-- 
ffmpeg packaging