summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Heinchen <heinchen@users.sourceforge.net>2003-04-15 23:54:40 +0000
committerAndreas Heinchen <heinchen@users.sourceforge.net>2003-04-15 23:54:40 +0000
commited5ec90442b4dda3918372b43072205fb4ea6167 (patch)
treeb952676bf3d1f21ed6b13559f6b5349e01a784c3
parentbb51c239695fb244229fba1226adac83feb8227a (diff)
downloadxine-lib-ed5ec90442b4dda3918372b43072205fb4ea6167.tar.gz
xine-lib-ed5ec90442b4dda3918372b43072205fb4ea6167.tar.bz2
fix ac3 in ogm
CVS patchset: 4617 CVS date: 2003/04/15 23:54:40
-rw-r--r--ChangeLog2
-rw-r--r--src/demuxers/demux_ogg.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9ad91c7be..807163cab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@ xine-lib (1-beta11)
* fix input_net (tcp) seeking
* network input plugins do not freeze when no data is available
* fix seeking in ogg files
+ * fix av/desync in ogmfiles
+ * fix ac3 in ogm support
xine-lib (1-beta10)
* loading and displaying png images (e.g. for logos)
diff --git a/src/demuxers/demux_ogg.c b/src/demuxers/demux_ogg.c
index 66bb3eaee..d39544bdf 100644
--- a/src/demuxers/demux_ogg.c
+++ b/src/demuxers/demux_ogg.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: demux_ogg.c,v 1.79 2003/04/15 03:41:23 heinchen Exp $
+ * $Id: demux_ogg.c,v 1.80 2003/04/15 23:54:40 heinchen Exp $
*
* demultiplexer for ogg streams
*
@@ -611,7 +611,7 @@ static void demux_ogg_send_header (demux_ogg_t *this) {
memcpy(str, &locsubtype, 4);
str[4] = 0;
- codec = atoi(str);
+ codec = strtoul(str, NULL, 16);
channel= this->num_audio_streams++;