[SCM] ffmpeg/master: revert syntax error

[fabian at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a6f8b27981496ab9d41d4773c49b8b8ac689e2b5
Author: Fabian Greffrath <fabian at debian.org>
Date:   Thu Aug 27 11:49:29 2015 +0200

    revert syntax error

diff --git a/debian/control b/debian/control
index 05adcce..25aee05 100644
--- a/debian/control
+++ b/debian/control
@@ -179,7 +179,7 @@ Architecture: any
 Multi-Arch: same
 Depends:
  ffmpeg (= ${binary:Version}),
- libavcodec-ffmpeg56 (= ${binary:Version}) || libavcodec-ffmpeg-extra56 (= ${binary:Version}),
+ libavcodec-ffmpeg56 (= ${binary:Version}) | libavcodec-ffmpeg-extra56 (= ${binary:Version}),
  libavdevice-ffmpeg56 (= ${binary:Version}),
  libavfilter-ffmpeg5 (= ${binary:Version}),
  libavformat-ffmpeg56 (= ${binary:Version}),
@@ -302,7 +302,7 @@ Multi-Arch: same
 Conflicts:
  libavcodec-libav-dev
 Depends:
- libavcodec-ffmpeg56 (= ${binary:Version}) || libavcodec-ffmpeg-extra56 (= ${binary:Version}),
+ libavcodec-ffmpeg56 (= ${binary:Version}) | libavcodec-ffmpeg-extra56 (= ${binary:Version}),
  libavutil-dev (= ${binary:Version}),
  libswresample-dev (= ${binary:Version}),
  ${misc:Depends}

-- 
ffmpeg packaging