- -devel R: libx264-devel now

- added versions to lzo-devel deps (lzo support must be disabled or updated)

Changed files:
    ffmpeg.spec -> 1.95

diff --git a/ffmpeg.spec b/ffmpeg.spec
index b082b5331ac37ee981d0296324026ea71addabef..d7727015e0f1d35ae1ce5bfe4bcd6de807a40bf0 100644 (file)
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -1,6 +1,6 @@
 #
 # TODO: only lzo 1.x is supported
-#      - make (ffmpeg code inside) mplayer play .3gp mobile phone movies 
+#      - make (ffmpeg code inside) mplayer play .3gp mobile phone movies
 #        (ffplay and vlc plays them fine
 #
 # Conditional build:
@@ -67,7 +67,7 @@ BuildRequires:        libtheora-devel
 BuildRequires: libtool >= 2:1.4d-3
 BuildRequires: libvorbis-devel
 BuildRequires: libx264-devel >= 0.1.2-1.20060430_2245.1
-BuildRequires: lzo-devel
+BuildRequires: lzo-devel < 2.0
 %ifarch %{ix86}
 %ifnarch i386 i486
 BuildRequires: nasm
@@ -135,7 +135,8 @@ Requires:   libdts-devel
 Requires:      libgsm-devel
 Requires:      libtheora-devel
 Requires:      libvorbis-devel
-Requires:      lzo-devel
+Requires:      lzo-devel < 2.0
+Requires:      libx264-devel >= 0.1.2-1.20060430_2245.1
 Requires:      xvid-devel >= 1:1.1.0
 Requires:      zlib-devel
 Obsoletes:     libpostproc-devel