rpms/ffmpeg/EL-6 ffmpeg-0.10-celt.patch, NONE, 1.1 .cvsignore, 1.27, 1.28 ffmpeg.spec, 1.48, 1.49 sources, 1.27, 1.28

[Dominik Mierzejewski]

Author: rathann

Update of /cvs/free/rpms/ffmpeg/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14996

Modified Files:
	.cvsignore ffmpeg.spec sources 
Added Files:
	ffmpeg-0.10-celt.patch 
Log Message:
* Tue Dec 11 2012 Dominik Mierzejewski <rpm at greysector.net> - 0.10.6-1
- Updated to 0.10.6
- Patch to build with older libcelt


ffmpeg-0.10-celt.patch:
 configure                |    2 +-
 libavcodec/libcelt_dec.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE ffmpeg-0.10-celt.patch ---
diff -up ffmpeg-0.10/configure.celt ffmpeg-0.10/configure
--- ffmpeg-0.10/configure.celt	2012-01-26 23:15:59.000000000 +0100
+++ ffmpeg-0.10/configure	2012-03-11 21:49:38.000000000 +0100
@@ -3128,7 +3128,7 @@ enabled gnutls     && require_pkg_config
 enabled libaacplus && require  "libaacplus >= 2.0.0" aacplus.h aacplusEncOpen -laacplus
 enabled libass     && require_pkg_config libass ass/ass.h ass_library_init
 enabled libcelt    && require libcelt celt/celt.h celt_decode -lcelt0 &&
-                      { check_lib celt/celt.h celt_decoder_create_custom -lcelt0 ||
+                      { check_lib celt/celt.h celt_decoder_create -lcelt0 ||
                         die "ERROR: libcelt version must be >= 0.11.0."; }
 enabled libdc1394  && require_pkg_config libdc1394-2 dc1394/dc1394.h dc1394_new
 enabled libdirac   && require_pkg_config dirac                          \
diff -up ffmpeg-0.10/libavcodec/libcelt_dec.c.celt ffmpeg-0.10/libavcodec/libcelt_dec.c
--- ffmpeg-0.10/libavcodec/libcelt_dec.c.celt	2012-01-26 23:15:59.000000000 +0100
+++ ffmpeg-0.10/libavcodec/libcelt_dec.c	2012-03-11 21:48:21.000000000 +0100
@@ -52,7 +52,7 @@ static int ff_celt_error_to_averror(int 
 static int ff_celt_bitstream_version_hack(CELTMode *mode)
 {
     CELTHeader header = { .version_id = 0 };
-    celt_header_init(&header, mode, 960, 2);
+    celt_header_init(&header, mode, 2);
     return header.version_id;
 }
 
@@ -67,7 +67,7 @@ static av_cold int libcelt_dec_init(AVCo
     celt->mode = celt_mode_create(c->sample_rate, c->frame_size, &err);
     if (!celt->mode)
         return ff_celt_error_to_averror(err);
-    celt->dec = celt_decoder_create_custom(celt->mode, c->channels, &err);
+    celt->dec = celt_decoder_create(celt->mode, c->channels, &err);
     if (!celt->dec) {
         celt_mode_destroy(celt->mode);
         return ff_celt_error_to_averror(err);


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/EL-6/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	7 Oct 2012 16:32:39 -0000	1.27
+++ .cvsignore	11 Dec 2012 22:47:17 -0000	1.28
@@ -1 +1 @@
-ffmpeg-0.10.5.tar.bz2
+ffmpeg-0.10.6.tar.bz2


Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/EL-6/ffmpeg.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- ffmpeg.spec	7 Oct 2012 16:32:39 -0000	1.48
+++ ffmpeg.spec	11 Dec 2012 22:47:17 -0000	1.49
@@ -6,12 +6,11 @@
 
 %if 0%{?rhel}
 %global _without_vpx   1
-%global _without_celt   1
 %endif
 
 Summary:        Digital VCR and streaming server
 Name:           ffmpeg
-Version:        0.10.5
+Version:        0.10.6
 Release:        1%{?date}%{?date:git}%{?rel}%{?dist}
 %if 0%{?_with_amr:1}
 License:        GPLv3+
@@ -27,6 +26,7 @@
 %endif
 Source1:        ffmpeg-snapshot-oldabi.sh
 Patch0:         ffmpeg-0.10.4-backport-libv4l2.patch
+Patch1:         ffmpeg-0.10-celt.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       %{name}-libs = %{version}-%{release}
 BuildRequires:  bzip2-devel
@@ -159,6 +159,7 @@
 %setup -q -n ffmpeg-%{version}
 %endif
 %patch0 -p1
+%patch1 -p1 -b .celt
 
 %build
 mkdir generic
@@ -280,6 +281,10 @@
 
 
 %changelog
+* Tue Dec 11 2012 Dominik Mierzejewski <rpm at greysector.net> - 0.10.6-1
+- Updated to 0.10.6
+- Patch to build with older libcelt
+
 * Thu Oct 04 2012 Julian Sikorski <belegdol at fedoraproject.org> - 0.10.5-1
 - Updated to 0.10.5
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/EL-6/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	7 Oct 2012 16:32:39 -0000	1.27
+++ sources	11 Dec 2012 22:47:17 -0000	1.28
@@ -1 +1 @@
-f1384d0312f95d6294e017fc38318521  ffmpeg-0.10.5.tar.bz2
+30dec94c65ae9a8cec9b950b158abd1c  ffmpeg-0.10.6.tar.bz2