summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog6
-rw-r--r--debian/changelog4
-rw-r--r--include/xine/buffer.h2
-rw-r--r--m4/video_out.m44
-rw-r--r--src/combined/ffmpeg/ff_audio_decoder.c2
-rw-r--r--src/combined/ffmpeg/ffmpeg_decoder.h4
-rw-r--r--src/demuxers/demux_flv.c4
-rw-r--r--src/input/input_cdda.c6
-rw-r--r--win32/libxine.def1
-rw-r--r--win32/libxinesupport.def1
10 files changed, 23 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 09371a8af..ef93b195c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -68,6 +68,12 @@ xine-lib (1.1.90) (Unreleased)
* Report more video output capabilities via (port)->get_capabilities():
colour controls, zooming, colour keying.
+xine-lib (1.1.16) 2008-??-??
+ * Fix reported compilation failures (with C++ programs).
+ * Fix CDDB access in 64-bit builds.
+ * Fix seeking FLV clips that don't specify the movie length in the headers.
+ * Support H.264 and AAC streams within FLV.
+
xine-lib (1.1.15) 2008-08-14
* Security fixes:
- Fix crashes with various corrupted media files, including Ogg.
diff --git a/debian/changelog b/debian/changelog
index 8e4eb98a9..0ceb2d890 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ xine-lib-1.2 (1.2.0~hg-0) experimental; urgency=low
-- Darren Salt <linux@youmustbejoking.demon.co.uk> Tue, 17 Apr 2007 16:50:37 +0100
-xine-lib (1.1.14~hg-0) unstable; urgency=low
+xine-lib (1.1.16~hg-0) unstable; urgency=low
[ Darren Salt ]
* Hg snapshot.
@@ -14,7 +14,7 @@ xine-lib (1.1.14~hg-0) unstable; urgency=low
* remove gs from build-dependencies
* change the maintainer field to xine-devel@lists.sourceforge.net.
- -- Darren Salt <linux@youmustbejoking.demon.co.uk> Thu, 26 Jun 2008 20:32:42 +0100
+ -- Darren Salt <linux@youmustbejoking.demon.co.uk> Fri, 15 Aug 2008 18:24:52 +0100
xine-lib (1.1.5~cvs-0) unstable; urgency=low
diff --git a/include/xine/buffer.h b/include/xine/buffer.h
index 5d1889012..110bcf4b9 100644
--- a/include/xine/buffer.h
+++ b/include/xine/buffer.h
@@ -712,7 +712,7 @@ void _x_bmiheader_le2me( xine_bmiheader *bih ) XINE_PROTECTED;
/** Convert xine_waveformatex struct from little endian */
void _x_waveformatex_le2me( xine_waveformatex *wavex ) XINE_PROTECTED;
-static inline _x_is_fourcc(void *ptr, void *tag) {
+static __inline int _x_is_fourcc(void *ptr, void *tag) {
return memcmp(ptr, tag, 4) == 0;
}
diff --git a/m4/video_out.m4 b/m4/video_out.m4
index df782ff06..67d063854 100644
--- a/m4/video_out.m4
+++ b/m4/video_out.m4
@@ -419,13 +419,13 @@ AC_DEFUN([XINE_VIDEO_OUT_PLUGINS], [
[test $default_enable_xvmc = disable && enable_xvmc="no"])
AC_ARG_WITH([xvmc-path],
[AS_HELP_STRING([--with-xvmc-path=PATH], [where libXvMC for the xvmc plugin are installed])],
- [], [with_xvmc_path="$x_libraries"])
+ [], [with_xvmc_path="${x_libraries:-/usr/lib}"])
AC_ARG_WITH([xvmc-lib],
[AS_HELP_STRING([--with-xvmc-lib=LIBNAME], [The name of the XvMC library libLIBNAME.so for the xvmc plugin])],
[], [with_xvmc_lib="XvMCW"])
AC_ARG_WITH([xxmc-path],
[AS_HELP_STRING([--with-xxmc-path=PATH], [Where libXvMC for the xxmc plugin are installed])],
- [], [with_xxmc_path="$x_libraries"])
+ [], [with_xxmc_path="${x_libraries:-/usr/lib}"])
AC_ARG_WITH([xxmc-lib],
[AS_HELP_STRING([--with-xxmc-lib=LIBNAME], [The name of the XvMC library libLIBNAME.so for the xxmc plugin])],
[], [with_xxmc_lib="XvMCW"])
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;
diff --git a/win32/libxine.def b/win32/libxine.def
index 4711e7758..2cd9cb028 100644
--- a/win32/libxine.def
+++ b/win32/libxine.def
@@ -56,6 +56,7 @@ _xine_private_basename
_xine_private_gettimeofday
_xine_private_hstrerror
_xine_private_setenv
+_xine_private_strcasestr
_xine_private_strndup
_xine_private_strsep
_xine_private_strtok_r
diff --git a/win32/libxinesupport.def b/win32/libxinesupport.def
index 0bb166d2d..068641822 100644
--- a/win32/libxinesupport.def
+++ b/win32/libxinesupport.def
@@ -18,6 +18,7 @@ _xine_private_basename
_xine_private_gettimeofday
_xine_private_hstrerror
_xine_private_setenv
+_xine_private_strcasestr
_xine_private_strndup
_xine_private_strsep
_xine_private_strtok_r
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-30 05:48:42 +0000