Author: rdieter Update of /cvs/free/rpms/xine-lib-extras-freeworld/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv7609 Modified Files: xine-lib-extras-freeworld.spec Added Files: xine-lib-1.1.15-ffmpeg-api.patch Removed Files: xine-lib-1.1.15-ffmpeg-bits_per_sample.patch Log Message: latest crack at updating for new ffmpeg-api xine-lib-1.1.15-ffmpeg-api.patch: --- NEW FILE xine-lib-1.1.15-ffmpeg-api.patch --- diff -up xine-lib-1.1.15/src/combined/ffmpeg/ff_audio_decoder.c.ffmpeg_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.ffmpeg_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 14:32:17.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; @@ -322,12 +326,24 @@ static void ff_audio_decode_data (audio_ if (!this->output_open) { if (!this->audio_bits || !this->audio_sample_rate || !this->audio_channels) { - avcodec_decode_audio (this->context, + +#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) + avcodec_decode_audio (this->context, (int16_t *)this->decode_buffer, &decode_buffer_size, &this->buf[0], this->size); - this->audio_bits = this->context->bits_per_sample; + + this->audio_bits = this->context->bits_per_sample; +#else + avcodec_decode_audio2 (this->context, + (int16_t *)this->decode_buffer, + &decode_buffer_size, + &this->buf[0], + this->size); + + 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.ffmpeg_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.ffmpeg_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 14:27:27.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.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- xine-lib-extras-freeworld.spec 17 Dec 2008 19:26:02 -0000 1.12 +++ xine-lib-extras-freeworld.spec 17 Dec 2008 20:35:59 -0000 1.13 @@ -19,7 +19,7 @@ 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 +Patch100: xine-lib-1.1.15-ffmpeg-api.patch BuildRequires: pkgconfig BuildRequires: zlib-devel @@ -27,7 +27,7 @@ %if 0%{?_with_external_ffmpeg:1} BuildRequires: ffmpeg-devel >= 0.4.9-0.22.20060804 # HACKS to workaround missing deps in ffmpeg-devel -BuildRequires: dirac-devel libraw1394-devel libtheora-devel libvorbis-devel +# BuildRequires: dirac-devel libraw1394-devel libtheora-devel libvorbis-devel %endif BuildRequires: a52dec-devel BuildRequires: libmad-devel @@ -67,8 +67,8 @@ touch -r m4/optimizations.m4.stamp m4/optimizations.m4 # 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 +# ffmpeg api +%patch100 -p1 -b .ffmpeg_api # Avoid standard rpaths on lib64 archs: sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure --- xine-lib-1.1.15-ffmpeg-bits_per_sample.patch DELETED ---