[SCM] x264/master: Require nasm (>= 2.13) instead of yasm

[ricotz-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 185c8c87eae33e29bd1f285654f0cee948a18135
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date:   Sun Dec 31 14:02:43 2017 +0100

    Require nasm (>= 2.13) instead of yasm

diff --git a/debian/control b/debian/control
index 46c7870..3701265 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends:
  libavformat-dev (>= 6:9) <!stage1>,
  libffms2-dev <!stage1>,
  libgpac-dev (>= 0.5.0+svn4288~) <!stage1>,
- yasm [any-i386 any-amd64]
+ nasm (>= 2.13) [any-i386 any-amd64]
 Standards-Version: 4.0.0
 Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/x264.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/x264.git
diff --git a/debian/control.in b/debian/control.in
index 1350df7..46b06e8 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -13,7 +13,7 @@ Build-Depends:
  libavformat-dev (>= 6:9) <!stage1>,
  libffms2-dev <!stage1>,
  libgpac-dev (>= 0.5.0+svn4288~) <!stage1>,
- yasm [any-i386 any-amd64]
+ nasm (>= 2.13) [any-i386 any-amd64]
 Standards-Version: 4.0.0
 Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/x264.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/x264.git

-- 
x264 packaging