Hi all,
Following patch fix build of xine-lib 1.1.15 with FFmpeg >= r15272
[key revisions 15262, 15272]
(aka 0472f3ecb8d65997f6de234110c5de06dc38a8f6,
57d4930ffe78d4b836f9ac744e90649e30b82c9b
Mon Sep 8 14:24:59 2008 +0000, Mon Sep 8 18:31:48 2008 +0000).
Comments for this revisions:
...
commit 57d4930ffe78d4b836f9ac744e90649e30b82c9b
Author: michael <[EMAIL PROTECTED]>
Date: Mon Sep 8 18:31:48 2008 +0000
Remove deprecated avcodec_decode_audio() this one was not under #ifdef.
...
commit 0472f3ecb8d65997f6de234110c5de06dc38a8f6
Author: michael <[EMAIL PROTECTED]>
Date: Mon Sep 8 14:24:59 2008 +0000
Bump Major version, this commit is almost just renaming bits_per_sample to
bits_per_coded_sample but that cannot be done seperately.
Patch by Luca Abeni
Also reset the minor version and fix the forgotton change to libfaad.
Note: The API/ABI should not be considered stable yet, there still may
be a change done here or there if some developer has some cleanup ideas and
patches!
...
--
Bests,
- ptr
diff -ur xine-lib-1.1.15/src/combined/ffmpeg/ff_audio_decoder.c xine-lib-1.1.15.new/src/combined/ffmpeg/ff_audio_decoder.c
--- xine-lib-1.1.15/src/combined/ffmpeg/ff_audio_decoder.c 2008-07-16 03:13:03.000000000 +0400
+++ xine-lib-1.1.15.new/src/combined/ffmpeg/ff_audio_decoder.c 2008-11-04 13:41:59.000000000 +0300
@@ -269,7 +269,7 @@
* bits/sample for some codecs (e.g. MS ADPCM) */
this->audio_bits = 16;
- this->context->bits_per_sample = this->audio_bits;
+ this->context->bits_per_coded_sample = this->audio_bits;
this->context->sample_rate = this->audio_sample_rate;
this->context->channels = this->audio_channels;
this->context->codec_id = this->codec->id;
@@ -322,12 +322,12 @@
if (!this->output_open) {
if (!this->audio_bits || !this->audio_sample_rate || !this->audio_channels) {
- avcodec_decode_audio (this->context,
+ 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_sample;
+ this->audio_bits = this->context->bits_per_coded_sample;
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 -ur xine-lib-1.1.15/src/combined/ffmpeg/ff_video_decoder.c xine-lib-1.1.15.new/src/combined/ffmpeg/ff_video_decoder.c
--- xine-lib-1.1.15/src/combined/ffmpeg/ff_video_decoder.c 2008-07-17 01:01:56.000000000 +0400
+++ xine-lib-1.1.15.new/src/combined/ffmpeg/ff_video_decoder.c 2008-11-04 13:42:35.000000000 +0300
@@ -939,7 +939,7 @@
this->context->extradata_size);
}
- this->context->bits_per_sample = this->bih.biBitCount;
+ this->context->bits_per_coded_sample = this->bih.biBitCount;
} else {
--
http://linuxfromscratch.org/mailman/listinfo/blfs-dev
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
