- added x264 bcond

Changed files:
    ffmpeg.spec -> 1.226

diff --git a/ffmpeg.spec b/ffmpeg.spec
index 5a2e13fc4922b84e9f21032c227ba2c15037bb2a..032fa61c7922c2845da56692fa0a5934bde58ea0 100644 (file)
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -5,6 +5,7 @@
 %bcond_with    nonfree         # non free options of package (currently: faac)
 %bcond_without autoreqdep      # don't care about package name deps generated by rpm
 %bcond_without frei0r          # build without frei0r video filtering
+%bcond_without x264            # build without x264 encoder
 %bcond_without va              # VAAPI (Video Acceleration API)
 %bcond_without vpx             # VP8, a high-quality video codec
 %bcond_without doc             # don't build docs
@@ -53,7 +54,7 @@ BuildRequires:        libvdpau-devel
 BuildRequires: libvorbis-devel
 %{?with_vpx:BuildRequires:     libvpx-devel >= 0.9.6}
 # X264_BUILD >= 83
-BuildRequires: libx264-devel >= 0.1.3-1.20110625_2245
+%{?with_x264:BuildRequires:    libx264-devel >= 0.1.3-1.20110625_2245}
 BuildRequires: opencore-amr-devel
 BuildRequires: openjpeg-devel >= 1.3-2
 BuildRequires: speex-devel >= 1:1.2-rc1
@@ -151,7 +152,7 @@ Requires:   libtheora-devel >= 1.0-0.beta3
 %{?with_va:Requires:   libva-devel >= 1.0.3}
 Requires:      libvorbis-devel
 %{?with_vpx:Requires:  libvpx-devel >= 0.9.6}
-Requires:      libx264-devel >= 0.1.3-1.20110625_2245
+%{?with_x264:Requires: libx264-devel >= 0.1.3-1.20110625_2245}
 Requires:      opencore-amr-devel
 Requires:      openjpeg-devel >= 1.3-2
 Requires:      schroedinger-devel
@@ -315,7 +316,7 @@ EOF
        --enable-libvo-amrwbenc \
        --enable-libvorbis \
        %{?with_vpx:--enable-libvpx} \
-       --enable-libx264 \
+       %{?with_x264:--enable-libx264} \
        --enable-libxavs \
        --enable-libxvid \
        --enable-postproc \