Logoj0ke.net Open Build Service > Projects > multimedia:SL12 > ffmpeg > Changes
Sign Up | Log In

Changes of Revision 6

[-] Changed ffmpeg.changes
 
1
@@ -1,5 +1,5 @@
2
 -------------------------------------------------------------------
3
-Sun Feb  5 20:15:18 UTC 2012 - cs@linux-administrator.com
4
+Fri May 31 11:33:03 UTC 2013 - cs@linux-administrator.com
5
6
-- re-import
7
+- re-import
8
9
​
[-] Changed ffmpeg.spec ^
78
 
1
@@ -11,7 +11,7 @@
2
 %define majoravutil      51
3
 %define libavutil        libavutil
4
 %define libnameavutil    %{libavutil}%{majoravutil}
5
-%define majoravfilter    2
6
+%define majoravfilter    3
7
 %define libavfilter      libavfilter
8
 %define libnameavfilter  %{libavfilter}%{majoravfilter}
9
 %define majorpostproc    52
10
@@ -26,7 +26,7 @@
11
 %define majoravresample  0
12
 %define libavresample    libavresample
13
 %define libnameavresample %{libavresample}%{majoravresample}
14
-%define lastrelease      0.11.2
15
+%define lastrelease      1.0.6
16
17
 %bcond_without avfilter
18
 %bcond_without libvpx
19
@@ -40,7 +40,7 @@
20
21
 Name:           ffmpeg
22
 Version:        %{lastrelease}
23
-Release:        1.9
24
+Release:        1.8
25
 License:        LGPL-2.0+ and some code GPL-2.0+
26
 Summary:        Hyper fast MPEG1/MPEG4/H263/RV and AC3/MPEG audio encoder
27
 Summary(de):    Hyperschneller MPEG1/MPEG4/H263/RV Und AC3/MPEG Audio-Encoder
28
@@ -84,10 +84,20 @@
29
 BuildRequires:  libxvidcore-devel
30
 BuildRequires:  schroedinger-devel
31
 BuildRequires:  speex-devel
32
+BuildRequires:  libtwolame-devel
33
 BuildRequires:  texinfo
34
 %if 0%{?suse_version} <= 1130
35
 BuildRequires:  libdc1394_control12-devel
36
 %endif
37
+%if 0%{?suse_version} >= 1140
38
+BuildRequires:  libass-devel
39
+BuildRequires:  libopus-devel
40
+%else
41
+BuildRequires:  libass-devel
42
+BuildRequires:  fontconfig-devel >= 2.4.2
43
+BuildRequires:  enca-devel
44
+BuildRequires:  fribidi-devel >= 0.19.0
45
+%endif
46
 %if %{with libopenjpeg}
47
 BuildRequires:  libopenjpeg-devel
48
 %endif
49
@@ -97,6 +107,7 @@
50
 BuildRequires:  libvpx-devel
51
 %endif
52
 %endif
53
+BuildRequires:  pkgconfig(vo-aacenc)
54
 Requires:       %{libnameavcodec}    = %{version}
55
 Requires:       %{libnameavdevice}   = %{version}
56
 Requires:       %{libnameavformat}   = %{version}
57
@@ -385,12 +396,19 @@
58
             --enable-libvpx \
59
 %endif
60
 %endif
61
+%if 0%{?suse_version} >= 1140
62
+            --enable-libopus --enable-libass \
63
+%else
64
+            --enable-libass \
65
+%endif
66
             --enable-libmp3lame --enable-libvorbis --enable-libtheora \
67
             --enable-libspeex --enable-libxvid --enable-libx264 \
68
             --enable-libschroedinger --enable-libgsm \
69
             --enable-libopencore-amrnb --enable-libopencore-amrwb \
70
             --enable-postproc --enable-libdc1394 --enable-librtmp \
71
-            --enable-libfreetype --enable-avresample
72
+            --enable-libfreetype --enable-avresample --enable-libtwolame \
73
+            --enable-libvo-aacenc
74
+
75
 make %{?_smp_mflags} V=1
76
77
 %install
78
​
[+] Changed baselibs.conf ^
Changed ffmpeg-1.0.6.tar.bz2 ^

Cancel