7:26 p.m.
Author: rdieter
Update of /cvs/free/rpms/xine-lib-extras-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3314
Modified Files:
xine-lib-extras-freeworld.spec
Added Files:
xine-lib-1.1.15-ffmpeg-bits_per_sample.patch
Log Message:
* Wed Dec 17 2008 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.15-5
- ffmpeg bits_per_sample patch
xine-lib-1.1.15-ffmpeg-bits_per_sample.patch:
--- NEW FILE xine-lib-1.1.15-ffmpeg-bits_per_sample.patch ---
diff -up xine-lib-1.1.15/src/combined/ffmpeg/ff_audio_decoder.c.bits_per_sample
xine-lib-1.1.15/src/combined/ffmpeg/ff_audio_decoder.c
--- xine-lib-1.1.15/src/combined/ffmpeg/ff_audio_decoder.c.bits_per_sample 2008-07-15
18:13:03.000000000 -0500
+++ xine-lib-1.1.15/src/combined/ffmpeg/ff_audio_decoder.c 2008-12-17 13:11:23.000000000
-0600
@@ -269,7 +269,11 @@ static void ff_audio_decode_data (audio_
* bits/sample for some codecs (e.g. MS ADPCM) */
this->audio_bits = 16;
- this->context->bits_per_sample = this->audio_bits;
+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+ this->context->bits_per_sample = this->audio_bits;
+#else
+ this->context->bits_per_coded_sample = this->audio_bits;
+#endif
this->context->sample_rate = this->audio_sample_rate;
this->context->channels = this->audio_channels;
this->context->codec_id = this->codec->id;
@@ -327,7 +331,12 @@ static void ff_audio_decode_data (audio_
&decode_buffer_size,
&this->buf[0],
this->size);
- this->audio_bits = this->context->bits_per_sample;
+
+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+ this->audio_bits = this->context->bits_per_sample;
+#else
+ this->audio_bits = this->context->bits_per_coded_sample;
+#endif
this->audio_sample_rate = this->context->sample_rate;
this->audio_channels = this->context->channels;
if (!this->audio_bits || !this->audio_sample_rate || !this->audio_channels)
diff -up xine-lib-1.1.15/src/combined/ffmpeg/ff_video_decoder.c.bits_per_sample
xine-lib-1.1.15/src/combined/ffmpeg/ff_video_decoder.c
--- xine-lib-1.1.15/src/combined/ffmpeg/ff_video_decoder.c.bits_per_sample 2008-07-16
16:01:56.000000000 -0500
+++ xine-lib-1.1.15/src/combined/ffmpeg/ff_video_decoder.c 2008-12-17 13:15:37.000000000
-0600
@@ -939,7 +939,12 @@ static void ff_handle_header_buffer (ff_
this->context->extradata_size);
}
- this->context->bits_per_sample = this->bih.biBitCount;
+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+ this->context->bits_per_sample = this->bih.biBitCount;
+#else
+ this->context->bits_per_coded_sample = this->bih.biBitCount;
+#endif
+
} else {
Index: xine-lib-extras-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/devel/xine-lib-extras-freeworld.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xine-lib-extras-freeworld.spec 17 Dec 2008 18:12:11 -0000 1.11
+++ xine-lib-extras-freeworld.spec 17 Dec 2008 19:26:02 -0000 1.12
@@ -15,10 +15,12 @@
Group: System Environment/Libraries
URL: http://xinehq.de/
Source0: http://downloads.sourceforge.net/xine/xine-lib-%{version}.tar.bz2
-Patch0: xine-lib-1.1.3-optflags.patch
-Patch6: xine-lib-1.1.1-deepbind-939.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: xine-lib-1.1.3-optflags.patch
+Patch6: xine-lib-1.1.1-deepbind-939.patch
+Patch100: xine-lib-1.1.15-ffmpeg-bits_per_sample.patch
+
BuildRequires: pkgconfig
BuildRequires: zlib-devel
BuildRequires: gawk
@@ -63,8 +65,10 @@
touch -r m4/optimizations.m4 m4/optimizations.m4.stamp
%patch0 -p1 -b .optflags
touch -r m4/optimizations.m4.stamp m4/optimizations.m4
-# Patch6 needed at least when compiling with external ffmpeg, #939.
+# Patch1 needed at least when compiling with external ffmpeg, #939.
%patch6 -p1 -b .deepbind
+# ffmpeg api: bits_per_sample->bits_per_coded_sample
+%patch100 -p1 -b .ffmpeg_bits_per_sample
# Avoid standard rpaths on lib64 archs:
sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
@@ -181,7 +185,7 @@
%changelog
* Wed Dec 17 2008 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.15-5
-- respin
+- ffmpeg bits_per_sample patch
* Thu Sep 25 2008 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.15-4
- Obsoletes: xine-lib-moles < 1.1.15-2