Merge from 1.1.

--HG--
rename : src/xine-engine/buffer.h => include/xine/buffer.h

4 files changed, 10 insertions, 6 deletions

diff --git a/src/combined/ffmpeg/ff_audio_decoder.c b/src/combined/ffmpeg/ff_audio_decoder.c
index 8559c6ece..476553e10 100644
--- a/src/combined/ffmpeg/ff_audio_decoder.c
+++ b/src/combined/ffmpeg/ff_audio_decoder.c
@@ -321,7 +321,7 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf)
 
     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],
diff --git a/src/combined/ffmpeg/ffmpeg_decoder.h b/src/combined/ffmpeg/ffmpeg_decoder.h
index 6de9e8772..3eb86f4bf 100644
--- a/src/combined/ffmpeg/ffmpeg_decoder.h
+++ b/src/combined/ffmpeg/ffmpeg_decoder.h
@@ -31,6 +31,10 @@
 #  include <libavcodec/avcodec.h>
 #endif
 
+#if LIBAVCODEC_VERSION_MAJOR > 51
+#define bits_per_sample bits_per_coded_sample
+#endif
+
 typedef struct ff_codec_s {
   uint32_t          type;
   enum CodecID      id;
diff --git a/src/demuxers/demux_flv.c b/src/demuxers/demux_flv.c
index 854d3940b..035f06a52 100644
--- a/src/demuxers/demux_flv.c
+++ b/src/demuxers/demux_flv.c
@@ -319,7 +319,7 @@ static int parse_flv_var(demux_flv_t *this,
         if (!this->index || this->num_indices != num) {
           if (this->index)
             free(this->index);
-          this->index = xine_xcalloc(num, sizeof(flv_index_entry_t));
+          this->index = calloc(num, sizeof(flv_index_entry_t));
           if (!this->index)
             return 0;
           this->num_indices = num;
@@ -337,7 +337,7 @@ static int parse_flv_var(demux_flv_t *this,
         if (!this->index || this->num_indices != num) {
           if (this->index)
             free(this->index);
-          this->index = xine_xcalloc(num, sizeof(flv_index_entry_t));
+          this->index = calloc(num, sizeof(flv_index_entry_t));
           if (!this->index)
             return 0;
           this->num_indices = num;
diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c
index ff14b5790..23378a8b1 100644
--- a/src/input/input_cdda.c
+++ b/src/input/input_cdda.c
@@ -146,7 +146,7 @@ typedef struct {
     char              *disc_category;
 
     int                fd;
-    unsigned long      disc_id;
+    uint32_t           disc_id;
 
     int                disc_length;
     trackinfo_t       *track;
@@ -1884,7 +1884,7 @@ static unsigned int _cdda_cddb_sum(int n) {
   }
   return ret;
 }
-static unsigned long _cdda_calc_cddb_id(cdda_input_plugin_t *this) {
+static uint32_t _cdda_calc_cddb_id(cdda_input_plugin_t *this) {
   int i, tsum = 0;
   
   if(this == NULL || (this->cddb.num_tracks <= 0))
@@ -1944,7 +1944,7 @@ static void _cdda_cdindex(cdda_input_plugin_t *this, cdrom_toc *toc) {
 /*
  * return cbbd disc id.
  */
-static unsigned long _cdda_get_cddb_id(cdda_input_plugin_t *this) {
+static uint32_t _cdda_get_cddb_id(cdda_input_plugin_t *this) {
 
   if(this == NULL || (this->cddb.num_tracks <= 0))
     return 0;