Update to 1.1.7 from Brad; I missed a 'cvs rm' too :(
This commit is contained in:
sthen
parent
c5176ff065
commit
85b522fe1e
@ -1,107 +0,0 @@
|
||||
$OpenBSD: patch-src_audio_out_Makefile_in,v 1.15 2009/04/04 00:28:56 sthen Exp $
|
||||
--- src/audio_out/Makefile.in.orig Thu Apr 2 14:45:51 2009
|
||||
+++ src/audio_out/Makefile.in Fri Apr 3 14:42:42 2009
|
||||
@@ -174,6 +174,18 @@ xineplug_ao_out_jack_la_LINK = $(LIBTOOL) --tag=CC $(A
|
||||
$(xineplug_ao_out_jack_la_LDFLAGS) $(LDFLAGS) -o $@
|
||||
@HAVE_JACK_TRUE@am_xineplug_ao_out_jack_la_rpath = -rpath \
|
||||
@HAVE_JACK_TRUE@ $(xineplugdir)
|
||||
+xineplug_ao_out_sndio_la_DEPENDENCIES = $(XINE_LIB) \
|
||||
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
|
||||
+am_xineplug_ao_out_sndio_la_OBJECTS = \
|
||||
+ xineplug_ao_out_sndio_la-audio_sndio_out.lo
|
||||
+xineplug_ao_out_sndio_la_OBJECTS = \
|
||||
+ $(am_xineplug_ao_out_sndio_la_OBJECTS)
|
||||
+xineplug_ao_out_sndio_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) \
|
||||
+ $(xineplug_ao_out_sndio_la_CFLAGS) $(CFLAGS) \
|
||||
+ $(xineplug_ao_out_sndio_la_LDFLAGS) $(LDFLAGS) -o $@
|
||||
+@HAVE_SNDIO_TRUE@am_xineplug_ao_out_sndio_la_rpath = -rpath \
|
||||
+@HAVE_SNDIO_TRUE@ $(xineplugdir)
|
||||
xineplug_ao_out_none_la_DEPENDENCIES = $(XINE_LIB) \
|
||||
$(am__DEPENDENCIES_1)
|
||||
am_xineplug_ao_out_none_la_OBJECTS = \
|
||||
@@ -237,6 +249,7 @@ SOURCES = $(xineplug_ao_out_alsa_la_SOURCES) \
|
||||
$(xineplug_ao_out_file_la_SOURCES) \
|
||||
$(xineplug_ao_out_fusionsound_la_SOURCES) \
|
||||
$(xineplug_ao_out_jack_la_SOURCES) \
|
||||
+ $(xineplug_ao_out_sndio_la_SOURCES) \
|
||||
$(xineplug_ao_out_none_la_SOURCES) \
|
||||
$(xineplug_ao_out_oss_la_SOURCES) \
|
||||
$(xineplug_ao_out_pulseaudio_la_SOURCES) \
|
||||
@@ -250,6 +263,7 @@ DIST_SOURCES = $(xineplug_ao_out_alsa_la_SOURCES) \
|
||||
$(xineplug_ao_out_file_la_SOURCES) \
|
||||
$(xineplug_ao_out_fusionsound_la_SOURCES) \
|
||||
$(xineplug_ao_out_jack_la_SOURCES) \
|
||||
+ $(xineplug_ao_out_sndio_la_SOURCES) \
|
||||
$(xineplug_ao_out_none_la_SOURCES) \
|
||||
$(xineplug_ao_out_oss_la_SOURCES) \
|
||||
$(xineplug_ao_out_pulseaudio_la_SOURCES) \
|
||||
@@ -356,6 +370,8 @@ IRIXAL_LIBS = @IRIXAL_LIBS@
|
||||
IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
|
||||
JACK_CFLAGS = @JACK_CFLAGS@
|
||||
JACK_LIBS = @JACK_LIBS@
|
||||
+SNDIO_CFLAGS = @SNDIO_CFLAGS@
|
||||
+SNDIO_LIBS = @SNDIO_LIBS@
|
||||
KSTAT_LIBS = @KSTAT_LIBS@
|
||||
LD = @LD@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
@@ -588,6 +604,7 @@ EXTRA_DIST = audio_irixal_out.c
|
||||
@HAVE_PULSEAUDIO_TRUE@pulseaudio_module = xineplug_ao_out_pulseaudio.la
|
||||
@HAVE_FUSIONSOUND_TRUE@fusionsound_module = xineplug_ao_out_fusionsound.la
|
||||
@HAVE_JACK_TRUE@jack_module = xineplug_ao_out_jack.la
|
||||
+@HAVE_SNDIO_TRUE@sndio_module = xineplug_ao_out_sndio.la
|
||||
|
||||
# IMPORTANT:
|
||||
# ---------
|
||||
@@ -605,7 +622,8 @@ xineplug_LTLIBRARIES = xineplug_ao_out_none.la xineplu
|
||||
$(pulseaudio_module) \
|
||||
$(directx2_module) \
|
||||
$(fusionsound_module) \
|
||||
- $(jack_module)
|
||||
+ $(jack_module) \
|
||||
+ $(sndio_module)
|
||||
|
||||
xineplug_ao_out_none_la_SOURCES = audio_none_out.c
|
||||
xineplug_ao_out_none_la_LIBADD = $(XINE_LIB) $(LTLIBINTL)
|
||||
@@ -672,6 +690,10 @@ xineplug_ao_out_jack_la_SOURCES = audio_jack_out.c
|
||||
xineplug_ao_out_jack_la_LIBADD = $(XINE_LIB) $(JACK_LIBS) $(LTLIBINTL)
|
||||
xineplug_ao_out_jack_la_CFLAGS = $(VISIBILITY_FLAG) $(JACK_CFLAGS)
|
||||
xineplug_ao_out_jack_la_LDFLAGS = -avoid-version -module
|
||||
+xineplug_ao_out_sndio_la_SOURCES = audio_sndio_out.c
|
||||
+xineplug_ao_out_sndio_la_LIBADD = $(XINE_LIB) $(SNDIO_LIBS)
|
||||
+xineplug_ao_out_sndio_la_CFLAGS = $(VISIBILITY_FLAG) $(SNDIO_CFLAGS)
|
||||
+xineplug_ao_out_sndio_la_LDFLAGS = -avoid-version -module
|
||||
all: all-am
|
||||
|
||||
.SUFFIXES:
|
||||
@@ -750,6 +772,8 @@ xineplug_ao_out_fusionsound.la: $(xineplug_ao_out_fusi
|
||||
$(xineplug_ao_out_fusionsound_la_LINK) $(am_xineplug_ao_out_fusionsound_la_rpath) $(xineplug_ao_out_fusionsound_la_OBJECTS) $(xineplug_ao_out_fusionsound_la_LIBADD) $(LIBS)
|
||||
xineplug_ao_out_jack.la: $(xineplug_ao_out_jack_la_OBJECTS) $(xineplug_ao_out_jack_la_DEPENDENCIES)
|
||||
$(xineplug_ao_out_jack_la_LINK) $(am_xineplug_ao_out_jack_la_rpath) $(xineplug_ao_out_jack_la_OBJECTS) $(xineplug_ao_out_jack_la_LIBADD) $(LIBS)
|
||||
+xineplug_ao_out_sndio.la: $(xineplug_ao_out_sndio_la_OBJECTS) $(xineplug_ao_out_sndio_la_DEPENDENCIES)
|
||||
+ $(xineplug_ao_out_sndio_la_LINK) $(am_xineplug_ao_out_sndio_la_rpath) $(xineplug_ao_out_sndio_la_OBJECTS) $(xineplug_ao_out_sndio_la_LIBADD) $(LIBS)
|
||||
xineplug_ao_out_none.la: $(xineplug_ao_out_none_la_OBJECTS) $(xineplug_ao_out_none_la_DEPENDENCIES)
|
||||
$(xineplug_ao_out_none_la_LINK) -rpath $(xineplugdir) $(xineplug_ao_out_none_la_OBJECTS) $(xineplug_ao_out_none_la_LIBADD) $(LIBS)
|
||||
xineplug_ao_out_oss.la: $(xineplug_ao_out_oss_la_OBJECTS) $(xineplug_ao_out_oss_la_DEPENDENCIES)
|
||||
@@ -774,6 +798,7 @@ distclean-compile:
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xineplug_ao_out_file_la-audio_file_out.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xineplug_ao_out_fusionsound_la-audio_fusionsound_out.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xineplug_ao_out_jack_la-audio_jack_out.Plo@am__quote@
|
||||
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xineplug_ao_out_sndio_la-audio_sndio_out.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xineplug_ao_out_none_la-audio_none_out.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xineplug_ao_out_oss_la-audio_oss_out.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xineplug_ao_out_pulseaudio_la-audio_pulse_out.Plo@am__quote@
|
||||
@@ -862,6 +887,13 @@ xineplug_ao_out_jack_la-audio_jack_out.lo: audio_jack_
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='audio_jack_out.c' object='xineplug_ao_out_jack_la-audio_jack_out.lo' libtool=yes @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xineplug_ao_out_jack_la_CFLAGS) $(CFLAGS) -c -o xineplug_ao_out_jack_la-audio_jack_out.lo `test -f 'audio_jack_out.c' || echo '$(srcdir)/'`audio_jack_out.c
|
||||
+
|
||||
+xineplug_ao_out_sndio_la-audio_sndio_out.lo: audio_sndio_out.c
|
||||
+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xineplug_ao_out_sndio_la_CFLAGS) $(CFLAGS) -MT xineplug_ao_out_sndio_la-audio_sndio_out.lo -MD -MP -MF $(DEPDIR)/xineplug_ao_out_sndio_la-audio_sndio_out.Tpo -c -o xineplug_ao_out_sndio_la-audio_sndio_out.lo `test -f 'audio_sndio_out.c' || echo '$(srcdir)/'`audio_sndio_out.c
|
||||
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xineplug_ao_out_sndio_la-audio_sndio_out.Tpo $(DEPDIR)/xineplug_ao_out_sndio_la-audio_sndio_out.Plo
|
||||
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='audio_sndio_out.c' object='xineplug_ao_out_sndio_la-audio_sndio_out.lo' libtool=yes @AMDEPBACKSLASH@
|
||||
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xineplug_ao_out_sndio_la_CFLAGS) $(CFLAGS) -c -o xineplug_ao_out_sndio_la-audio_sndio_out.lo `test -f 'audio_sndio_out.c' || echo '$(srcdir)/'`audio_sndio_out.c
|
||||
|
||||
xineplug_ao_out_none_la-audio_none_out.lo: audio_none_out.c
|
||||
@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xineplug_ao_out_none_la_CFLAGS) $(CFLAGS) -MT xineplug_ao_out_none_la-audio_none_out.lo -MD -MP -MF $(DEPDIR)/xineplug_ao_out_none_la-audio_none_out.Tpo -c -o xineplug_ao_out_none_la-audio_none_out.lo `test -f 'audio_none_out.c' || echo '$(srcdir)/'`audio_none_out.c
|
||||
@ -1,66 +0,0 @@
|
||||
$OpenBSD: patch-src_demuxers_demux_matroska_c,v 1.3 2009/07/14 09:10:05 sthen Exp $
|
||||
--- src/demuxers/demux_matroska.c.orig Mon Jul 13 04:09:24 2009
|
||||
+++ src/demuxers/demux_matroska.c Mon Jul 13 04:12:12 2009
|
||||
@@ -2078,6 +2078,31 @@ static int parse_block (demux_matroska_t *this, size_t
|
||||
return 1;
|
||||
}
|
||||
|
||||
+static int parse_simpleblock(demux_matroska_t *this, size_t block_len, uint64_t cluster_timecode, uint64_t block_duration)
|
||||
+{
|
||||
+ int has_block = 0;
|
||||
+ off_t block_pos = 0;
|
||||
+ off_t file_len = 0;
|
||||
+ int normpos = 0;
|
||||
+ int is_key = 1;
|
||||
+
|
||||
+ lprintf("simpleblock\n");
|
||||
+ block_pos = this->input->get_current_pos(this->input);
|
||||
+ file_len = this->input->get_length(this->input);
|
||||
+ if( file_len )
|
||||
+ normpos = (int) ( (double) block_pos * 65535 / file_len );
|
||||
+
|
||||
+ if (!read_block_data(this, block_len))
|
||||
+ return 0;
|
||||
+
|
||||
+ has_block = 1;
|
||||
+ /* we have the duration, we can parse the block now */
|
||||
+ if (!parse_block(this, block_len, cluster_timecode, block_duration,
|
||||
+ normpos, is_key))
|
||||
+ return 0;
|
||||
+ return 1;
|
||||
+}
|
||||
+
|
||||
static int parse_block_group(demux_matroska_t *this,
|
||||
uint64_t cluster_timecode,
|
||||
uint64_t cluster_duration) {
|
||||
@@ -2142,7 +2167,8 @@ static int parse_block_group(demux_matroska_t *this,
|
||||
|
||||
static int parse_cluster(demux_matroska_t *this) {
|
||||
ebml_parser_t *ebml = this->ebml;
|
||||
- int next_level = 2;
|
||||
+ int this_level = ebml->level;
|
||||
+ int next_level = this_level;
|
||||
uint64_t timecode = 0;
|
||||
uint64_t duration = 0;
|
||||
|
||||
@@ -2159,7 +2185,7 @@ static int parse_cluster(demux_matroska_t *this) {
|
||||
this->first_cluster_found = 1;
|
||||
}
|
||||
|
||||
- while (next_level == 2) {
|
||||
+ while (next_level == this_level) {
|
||||
ebml_elem_t elem;
|
||||
|
||||
if (!ebml_read_elem_head(ebml, &elem))
|
||||
@@ -2181,6 +2207,11 @@ static int parse_cluster(demux_matroska_t *this) {
|
||||
if (!ebml_read_master (ebml, &elem))
|
||||
return 0;
|
||||
if ((elem.len > 0) && !parse_block_group(this, timecode, duration))
|
||||
+ return 0;
|
||||
+ break;
|
||||
+ case MATROSKA_ID_CL_SIMPLEBLOCK:
|
||||
+ lprintf("simpleblock\n");
|
||||
+ if (!parse_simpleblock(this, elem.len, timecode, duration))
|
||||
return 0;
|
||||
break;
|
||||
case MATROSKA_ID_CL_BLOCK:
|
||||
@ -1,11 +0,0 @@
|
||||
$OpenBSD: patch-src_demuxers_matroska_h,v 1.1 2009/07/14 09:10:05 sthen Exp $
|
||||
--- src/demuxers/matroska.h.orig Mon Jul 13 04:08:37 2009
|
||||
+++ src/demuxers/matroska.h Mon Jul 13 04:09:06 2009
|
||||
@@ -62,6 +62,7 @@
|
||||
#define MATROSKA_ID_CL_BLOCKGROUP 0xA0
|
||||
#define MATROSKA_ID_CL_BLOCK 0xA1
|
||||
#define MATROSKA_ID_CL_BLOCKVIRTUAL 0xA2
|
||||
+#define MATROSKA_ID_CL_SIMPLEBLOCK 0xA3
|
||||
#define MATROSKA_ID_CL_BLOCKADDITIONS 0x75A1
|
||||
#define MATROSKA_ID_CL_BLOCKMORE 0xA6
|
||||
#define MATROSKA_ID_CL_BLOCKADDID 0xEE
|
||||
Loading…
Reference in New Issue
Block a user