Author: rathann Update of /cvs/free/rpms/xine-lib-extras-freeworld/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv22308 Modified Files: xine-lib-1.1.15-ffmpeg-api.patch Log Message: - remove whitespace changes from xine-lib-1.1.15-ffmpeg-api.patch xine-lib-1.1.15-ffmpeg-api.patch: Index: xine-lib-1.1.15-ffmpeg-api.patch =================================================================== RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/devel/xine-lib-1.1.15-ffmpeg-api.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xine-lib-1.1.15-ffmpeg-api.patch 17 Dec 2008 20:35:59 -0000 1.1 +++ xine-lib-1.1.15-ffmpeg-api.patch 20 Dec 2008 18:36:51 -0000 1.2 @@ -1,60 +1,52 @@ -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 +diff -up xine-lib-1.1.15/src/combined/ffmpeg/ff_audio_decoder.c.ffmpeg_api 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_api 2008-07-16 01:13:03.000000000 +0200 ++++ xine-lib-1.1.15/src/combined/ffmpeg/ff_audio_decoder.c 2008-12-17 22:54:15.000000000 +0100 @@ -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; + 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_ +@@ -322,12 +326,21 @@ 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, + 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; + 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_ +diff -up xine-lib-1.1.15/src/combined/ffmpeg/ff_video_decoder.c.ffmpeg_api 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_api 2008-07-16 23:01:56.000000000 +0200 ++++ xine-lib-1.1.15/src/combined/ffmpeg/ff_video_decoder.c 2008-12-17 22:54:56.000000000 +0100 +@@ -939,7 +939,11 @@ 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; + this->context->bits_per_sample = this->bih.biBitCount; +#else + this->context->bits_per_coded_sample = this->bih.biBitCount; +#endif -+ } else {