rpms/ffmpeg/devel ffmpeg.spec,1.85,1.86

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/free/rpms/ffmpeg/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv29726

Modified Files:
	ffmpeg.spec 
Log Message:
Re-enable libcdio



Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- ffmpeg.spec	21 Jun 2013 09:34:46 -0000	1.85
+++ ffmpeg.spec	27 Jun 2013 09:20:47 -0000	1.86
@@ -10,14 +10,11 @@
 %global _without_opencv   1
 %global _without_vpx      1
 %endif
-%if 0%{?fedora} >= 19
-%global _without_cdio     1
-%endif
 
 Summary:        Digital VCR and streaming server
 Name:           ffmpeg
 Version:        1.2.1
-Release:        3%{?date}%{?date:git}%{?rel}%{?dist}
+Release:        4%{?date}%{?date:git}%{?rel}%{?dist}
 %if 0%{?_with_amr:1}
 License:        GPLv3+
 %else
@@ -290,6 +287,9 @@
 
 
 %changelog
+* Thu Jun 27 2013 Nicolas Chauvet <kwizart at gmail.com> - 1.2.1-4
+- Re-enable libcdio
+
 * Wed Jun 19 2013 Nicolas Chauvet <kwizart at gmail.com> - 1.2.1-3
 - Enable neon on armv7hnl
 - Enable thumb on all arm but armv6hl